dokku-compose 0.9.3 → 0.10.1

package/README.md

@@ -124,6 +124,7 @@ All features are idempotent — running `up` twice produces no changes.
 | Zero-Downtime Checks | Configure deploy checks, disable per process type | [checks](docs/reference/checks.md) |
 | Log Management | Log retention and vector sink configuration | [logs](docs/reference/logs.md) |
 | Plugins | Install Dokku plugins declaratively | [plugins](docs/reference/plugins.md) |
+| Docker Auth | Authenticate the host docker daemon to private registries (e.g. ghcr.io) for `git:from-image` flows | [docker_auth](docs/reference/docker_auth.md) |
 | Postgres | Postgres services with optional S3 backups | [postgres](docs/reference/postgres.md) |
 | Redis | Redis service instances | [redis](docs/reference/redis.md) |
 | Service Links | Link postgres/redis services to apps | [plugins](docs/reference/plugins.md#linking-services-to-apps-appsapplinks) |

package/dist/index.js

@@ -92,11 +92,16 @@ var PluginSchema = z.object({
   url: z.string().url(),
   version: z.string().optional()
 });
+var DockerAuthEntrySchema = z.object({
+  username: z.string().min(1),
+  password: z.string().min(1)
+});
 var ConfigSchema = z.object({
   dokku: z.object({
     version: z.string().optional()
   }).optional(),
   plugins: z.record(z.string(), PluginSchema).optional(),
+  docker_auth: z.record(z.string(), DockerAuthEntrySchema).optional(),
   networks: z.array(z.string()).optional(),
   postgres: z.record(z.string(), PostgresSchema).optional(),
   redis: z.record(z.string(), RedisSchema).optional(),
@@ -149,6 +154,7 @@ function createRunner(opts = {}) {
   const controlPath = opts.host ? path.join(os.tmpdir(), `dc-${createHash("sha1").update(opts.host).digest("hex").slice(0, 16)}.sock`) : null;
   const sshControlFlags = controlPath ? ["-o", "ControlMaster=auto", "-o", `ControlPath=${controlPath}`, "-o", "ControlPersist=60"] : [];
   function shellQuote(arg) {
+    if (/^[A-Za-z0-9_\-:.,/=@]+$/.test(arg)) return arg;
     return `'${arg.replace(/'/g, "'\\''")}'`;
   }
   async function execDokku(args) {
@@ -387,18 +393,21 @@ var Domains = {
     for (const d of added) await ctx.run("domains:add", target, d);
   }
 };
+function parseDeployMounts(raw) {
+  return raw.split(/\s+/).filter((s) => s && s !== "-v");
+}
 var Storage = {
   key: "storage",
   read: async (ctx, target) => {
-    const raw = await ctx.query("storage:report", target, "--storage-mounts");
-    return splitLines(raw);
+    const raw = await ctx.query("storage:report", target, "--storage-deploy-mounts");
+    return parseDeployMounts(raw);
   },
   readAll: async (ctx) => {
     const raw = await ctx.query("storage:report");
     const bulk = parseBulkReport(raw, "storage");
     const result = /* @__PURE__ */ new Map();
     for (const [app, report] of bulk) {
-      result.set(app, report["mounts"] ? splitLines(report["mounts"]) : []);
+      result.set(app, report["deploy-mounts"] ? parseDeployMounts(report["deploy-mounts"]) : []);
     }
     return result;
   },
@@ -805,6 +814,15 @@ async function ensurePlugins(ctx, plugins) {
   }
 }
 
+// src/modules/docker-auth.ts
+async function ensureDockerAuth(ctx, config) {
+  for (const [server, creds] of Object.entries(config)) {
+    logAction("docker-auth", `Logging in to ${server} as ${creds.username}`);
+    await ctx.run("registry:login", server, creds.username, creds.password);
+    logDone();
+  }
+}
+
 // src/modules/network.ts
 async function ensureNetworks(ctx, networks) {
   for (const net of networks) {
@@ -1081,6 +1099,7 @@ async function ensureGlobalNginx(ctx, nginx) {
 async function runUp(ctx, config, appFilter) {
   const apps = appFilter.length > 0 ? appFilter : Object.keys(config.apps);
   if (config.plugins) await ensurePlugins(ctx, config.plugins);
+  if (config.docker_auth) await ensureDockerAuth(ctx, config.docker_auth);
   if (config.domains !== void 0) await ensureGlobalDomains(ctx, config.domains);
   if (config.env !== void 0) await ensureGlobalConfig(ctx, config.env);
   if (config.logs !== void 0) await ensureGlobalLogs(ctx, config.logs);
@@ -1240,9 +1259,14 @@ function maskValue(value) {
   return `****${value.slice(-4)}`;
 }
 function maskSensitiveArgs(cmd) {
-  return cmd.replace(/([^\s=]*(?:TOKEN|SECRET|PASSWORD|KEY|AUTH|CREDENTIAL)[^\s=]*)=(\S+)/gi, (_, key, value) => {
+  let masked = cmd.replace(/([^\s=]*(?:TOKEN|SECRET|PASSWORD|KEY|AUTH|CREDENTIAL)[^\s=]*)=(\S+)/gi, (_, key, value) => {
     return `${key}=${maskValue(value)}`;
   });
+  masked = masked.replace(
+    /^(registry:login\s+\S+\s+\S+\s+)(\S+)/,
+    (_, prefix, password) => `${prefix}${maskValue(password)}`
+  );
+  return masked;
 }
 function maskSensitiveData(data) {
   if (data === null || data === void 0) return data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dokku-compose",
-  "version": "0.9.3",
+  "version": "0.10.1",
   "description": "Docker Compose for Dokku — declare your entire server in a single YAML file.",
   "main": "dist/index.js",
   "exports": "./dist/index.js",