hammerkit 1.9.0 → 1.9.2

package/dist/docker/pull.js

@@ -1,20 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pull = void 0;
-async function pull(status, docker, imageName) {
-    let searchImageName = imageName;
-    if (imageName.indexOf(':') === -1) {
-        searchImageName += ':latest';
-    }
+exports.splitImageName = exports.isImagePresent = exports.pull = void 0;
+const registry_credentials_1 = require("../cache/backends/registry/registry-credentials");
+const registry_reference_1 = require("../cache/backends/registry/registry-reference");
+async function pull(status, docker, imageName, environment) {
     const images = await docker.listImages({});
-    if (images.some((i) => i.RepoTags?.some((repoTag) => repoTag === searchImageName))) {
+    if (isImagePresent(images, imageName)) {
         return;
     }
     status.write('debug', `pull image ${imageName}`);
-    const image = await docker.pull(imageName);
+    const authconfig = await getPullAuth(imageName, environment);
+    const image = await docker.pull(imageName, authconfig ? { authconfig } : {});
     await new Promise((resolve, reject) => {
         docker.modem.followProgress(image, (err, res) => (err ? reject(err) : resolve(res)));
     });
 }
 exports.pull = pull;
+// A tag is present when an image carries it; an image pinned by digest
+// (`repo:tag@sha256:…`) when an image was pulled with that digest, whatever
+// tag it has now.
+function isImagePresent(images, imageName) {
+    const { repository, tag, digest } = splitImageName(imageName);
+    if (digest) {
+        return images.some((i) => i.RepoDigests?.some((repoDigest) => repoDigest === `${repository}@${digest}`));
+    }
+    return images.some((i) => i.RepoTags?.some((repoTag) => repoTag === `${repository}:${tag ?? 'latest'}`));
+}
+exports.isImagePresent = isImagePresent;
+function splitImageName(imageName) {
+    const [name, digest] = imageName.split('@');
+    const lastSlash = name.lastIndexOf('/');
+    const tagSeparator = name.indexOf(':', lastSlash + 1);
+    if (tagSeparator === -1) {
+        return { repository: name, tag: null, digest: digest ?? null };
+    }
+    return { repository: name.substring(0, tagSeparator), tag: name.substring(tagSeparator + 1), digest: digest ?? null };
+}
+exports.splitImageName = splitImageName;
+// The credentials `docker login` stored for the image's registry, like the
+// docker CLI uses them; dockerode sends none on its own, so a private image
+// could only be used when it was already present.
+async function getPullAuth(imageName, environment) {
+    const { repository } = splitImageName(imageName);
+    const { credentialHost } = (0, registry_reference_1.parseRegistryReference)(repository);
+    const credentials = await (0, registry_credentials_1.resolveRegistryCredentials)(credentialHost, environment);
+    if (!credentials) {
+        return null;
+    }
+    return { ...credentials, serveraddress: credentialHost };
+}
 //# sourceMappingURL=pull.js.map

package/dist/executer/docker-service.js

@@ -23,7 +23,7 @@ async function dockerService(docker, item, options, environment) {
     try {
         await (0, execution_steps_1.prepareMounts)(item, environment);
         (0, abort_1.checkForAbort)(options.abort);
-        await (0, execution_steps_1.pullImage)(item, docker);
+        await (0, execution_steps_1.pullImage)(item, docker, environment);
         (0, abort_1.checkForAbort)(options.abort);
         await (0, execution_steps_1.prepareVolume)(item, docker);
         (0, abort_1.checkForAbort)(options.abort);

package/dist/executer/docker-task.js

@@ -79,7 +79,7 @@ async function dockerTask(docker, item, environment, options) {
         }
         await (0, execution_steps_1.prepareMounts)(item, environment);
         (0, abort_1.checkForAbort)(options.abort);
-        await (0, execution_steps_1.pullImage)(item, docker);
+        await (0, execution_steps_1.pullImage)(item, docker, environment);
         (0, abort_1.checkForAbort)(options.abort);
         await (0, execution_steps_1.prepareVolume)(item, docker);
         (0, abort_1.checkForAbort)(options.abort);

package/dist/executer/execute-work-service.js

@@ -17,6 +17,13 @@ async function executeWorkService(work, environment, options) {
             const required = await (0, await_completed_dependencies_1.awaitRequirement)(work, environment.abortCtrl.signal, { untilAllDone: !options.watch });
             if (!required) {
                 work.status.write('debug', `${work.name} not started, no task needing it had to run`);
+                // ended, so the services it needs see it done too; left pending they
+                // would wait for it forever and the run would never finish
+                work.state.set({
+                    type: 'end',
+                    reason: 'not-started',
+                    stateKey: null,
+                });
                 return;
             }
         }

package/dist/executer/execution-steps.js

@@ -8,8 +8,8 @@ const set_user_permission_1 = require("./set-user-permission");
 const work_task_1 = require("../planner/work-task");
 const work_service_1 = require("../planner/work-service");
 const get_container_binds_1 = require("./get-container-binds");
-async function pullImage(item, docker) {
-    await (0, pull_1.pull)(item.status, docker, item.data.image);
+async function pullImage(item, docker, environment) {
+    await (0, pull_1.pull)(item.status, docker, item.data.image, environment);
 }
 exports.pullImage = pullImage;
 async function prepareVolume(item, docker) {

package/dist/log.js

@@ -100,6 +100,9 @@ async function printWorkTreeResult(schedulerState, env) {
     for (const service of (0, plan_work_tasks_1.iterateWorkServices)(schedulerState)) {
         let message = `${formatDate(new Date())} ${getType('service')} ${getNodeName(service.name, maxNodeNameLength)} - ${getStateText(service.state.current)}`;
         if (service.state.current.type === 'end') {
+            if (service.state.current.reason === 'not-started') {
+                continue;
+            }
             if (service.state.current.reason === 'crash') {
                 message += ` crashed`;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hammerkit",
   "description": "Containerized build tool with incremental caching that runs the same build file locally, in Docker and on Kubernetes.",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "keywords": [
     "build",
     "build-tool",