@plexus-ms/cli-ci 0.109.0 → 0.110.0

package/dist/plx-ci.js

@@ -11173,7 +11173,10 @@ function sidecarArgs(name, port, bucket, storage, readOnly) {
     "-e",
     "REGISTRY_STORAGE_S3_FORCEPATHSTYLE=true",
     "-e",
-    readOnly ? "REGISTRY_STORAGE_MAINTENANCE_READONLY_ENABLED=true" : "REGISTRY_STORAGE_DELETE_ENABLED=true",
+    // registry:2 panics on the read-only flag as one nested variable
+    // (…_READONLY_ENABLED=true): the map it builds from it has the wrong
+    // type. The whole key as one YAML value is read as from a config file.
+    readOnly ? 'REGISTRY_STORAGE_MAINTENANCE_READONLY={"enabled":true}' : "REGISTRY_STORAGE_DELETE_ENABLED=true",
     REGISTRY_IMAGE
   ];
 }
@@ -11187,6 +11190,13 @@ async function answers(ctx, port) {
 }
 async function startSidecars(ctx, storage, owner, zone, now = /* @__PURE__ */ new Date()) {
   const buckets = registryBuckets(owner, now);
+  if (!ctx.dryRun && await answers(ctx, CURRENT_PORT)) {
+    const previousAnswers2 = await answers(ctx, PREVIOUS_PORT);
+    ctx.say(`registry: :${CURRENT_PORT} answers already, the host's pair; nothing started`);
+    return { current: buckets.current, previous: buckets.previous, previousAnswers: previousAnswers2 };
+  }
+  if (!storage)
+    throw new Error("REGISTRY_ENDPOINT, REGISTRY_REGION, REGISTRY_ACCESS_KEY and REGISTRY_SECRET_KEY are needed");
   const sos = new Storage(ctx, storage.accessKey, storage.secretKey);
   if (!await sos.bucketExists(buckets.current)) {
     ctx.say(`\u2192 creating the bucket ${buckets.current} in ${zone}`);
@@ -11801,7 +11811,7 @@ runcmd:
   - plexus-ci-exo version >/dev/null
   # The registry sidecars, when the launch named a bucket (ci.md, "The registry"): :5000 on this month's bucket, read-write; :5001 on the previous month's, read-only. The same two containers as .github/ci/registry.sh starts on a GitHub runner.
   - . /etc/plexus-ci/env && if [ -n "$REGISTRY_ENDPOINT" ]; then docker run -d --name registry --restart unless-stopped -p 127.0.0.1:5000:5000 -e REGISTRY_STORAGE=s3 -e REGISTRY_STORAGE_S3_REGIONENDPOINT="$REGISTRY_ENDPOINT" -e REGISTRY_STORAGE_S3_REGION="$REGISTRY_REGION" -e REGISTRY_STORAGE_S3_BUCKET="$REGISTRY_BUCKET" -e REGISTRY_STORAGE_S3_ACCESSKEY="$REGISTRY_ACCESS_KEY" -e REGISTRY_STORAGE_S3_SECRETKEY="$REGISTRY_SECRET_KEY" -e REGISTRY_STORAGE_S3_FORCEPATHSTYLE=true -e REGISTRY_STORAGE_DELETE_ENABLED=true registry:2 >/dev/null; fi
-  - . /etc/plexus-ci/env && if [ -n "$REGISTRY_ENDPOINT" ]; then docker run -d --name registry-previous --restart on-failure:3 -p 127.0.0.1:5001:5000 -e REGISTRY_STORAGE=s3 -e REGISTRY_STORAGE_S3_REGIONENDPOINT="$REGISTRY_ENDPOINT" -e REGISTRY_STORAGE_S3_REGION="$REGISTRY_REGION" -e REGISTRY_STORAGE_S3_BUCKET="$REGISTRY_PREVIOUS_BUCKET" -e REGISTRY_STORAGE_S3_ACCESSKEY="$REGISTRY_ACCESS_KEY" -e REGISTRY_STORAGE_S3_SECRETKEY="$REGISTRY_SECRET_KEY" -e REGISTRY_STORAGE_S3_FORCEPATHSTYLE=true -e REGISTRY_STORAGE_MAINTENANCE_READONLY_ENABLED=true registry:2 >/dev/null; fi
+  - . /etc/plexus-ci/env && if [ -n "$REGISTRY_ENDPOINT" ]; then docker run -d --name registry-previous --restart on-failure:3 -p 127.0.0.1:5001:5000 -e REGISTRY_STORAGE=s3 -e REGISTRY_STORAGE_S3_REGIONENDPOINT="$REGISTRY_ENDPOINT" -e REGISTRY_STORAGE_S3_REGION="$REGISTRY_REGION" -e REGISTRY_STORAGE_S3_BUCKET="$REGISTRY_PREVIOUS_BUCKET" -e REGISTRY_STORAGE_S3_ACCESSKEY="$REGISTRY_ACCESS_KEY" -e REGISTRY_STORAGE_S3_SECRETKEY="$REGISTRY_SECRET_KEY" -e REGISTRY_STORAGE_S3_FORCEPATHSTYLE=true -e 'REGISTRY_STORAGE_MAINTENANCE_READONLY={"enabled":true}' registry:2 >/dev/null; fi
   # A builder: the docker driver cannot export a registry cache, so BuildKit runs in its own container on the host's network, where localhost:5000 is the sidecar; bootstrapped now so that the build does not wait for it.
   - . /etc/plexus-ci/env && if [ "$KIND" = build ]; then su -s /bin/bash runner -c 'docker buildx create --name ci --driver docker-container --driver-opt network=host --bootstrap >/dev/null' & fi
   - . /etc/plexus-ci/env && if [ "$KIND" = test ]; then docker pull -q postgres:18.6 >/dev/null & docker pull -q rustfs/rustfs:1.0.4 >/dev/null & fi
@@ -12377,13 +12387,10 @@ function register5(program2) {
 // src/commands/registry.ts
 function register6(program2) {
   const registry = program2.command("registry").description(
-    "start the registry sidecars: :5000 on this month\u2019s bucket read-write, :5001 on the previous month\u2019s read-only"
+    "start the registry sidecars: :5000 on this month\u2019s bucket read-write, :5001 on the previous month\u2019s read-only; nothing where :5000 answers"
   ).action(async (_opts, command) => {
     const ctx = contextOf(command);
-    const storage = storageFromEnv();
-    if (!storage)
-      throw new Error("REGISTRY_ENDPOINT, REGISTRY_REGION, REGISTRY_ACCESS_KEY and REGISTRY_SECRET_KEY are needed");
-    const result = await startSidecars(ctx, storage, ownerOf(need("GITHUB_REPOSITORY")), zoneOf());
+    const result = await startSidecars(ctx, storageFromEnv(), ownerOf(need("GITHUB_REPOSITORY")), zoneOf());
     ctx.result(
       result,
       (r) => `:5000 ${r.current}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plexus-ms/cli-ci",
-  "version": "0.109.0",
+  "version": "0.110.0",
   "description": "plx-ci, the CI verbs of Plexus: throwaway runners on a cloud, a registry on object storage, reproducible image builds, and their teardown",
   "license": "GPL-3.0-or-later",
   "type": "module",
@@ -23,7 +23,7 @@
     "node": ">=24.22.1"
   },
   "dependencies": {
-    "@plexus-ms/lib": "0.109.0",
+    "@plexus-ms/lib": "0.110.0",
     "commander": "^15.0.0",
     "yaml": "^2.9.1"
   },