[minor] Use shared base initialization tools

.github/workflows/sitectl-create-smoke-test.yaml

@@ -26,11 +26,14 @@ jobs:
               --iiif triplet
               --iiif-topology disabled
               --bot-mitigation off
-    uses: libops/.github/.github/workflows/sitectl-create-smoke-test.yaml@55489923a34bd3714d2a1b9c5f8a6c678ea1cbfe # main
+    uses: libops/.github/.github/workflows/sitectl-create-smoke-test.yaml@92a70c027cfe2553a8bc4adaba67a3e620ff6958 # main
     with:
       plugin: isle
       create-definition: ${{ matrix.create_definition }}
       create-args: ${{ matrix.create_args }}
-      packages: sitectl sitectl-drupal sitectl-isle
-      package-versions: sitectl=1.0.0 sitectl-drupal=1.0.0 sitectl-isle=1.0.0
+      packages: sitectl sitectl-drupal
+      package-versions: sitectl=1.0.0 sitectl-drupal=1.0.0
       allow-unversioned-packages: false
+      local-plugin-repository: libops/sitectl-isle
+      local-plugin-ref: canonical-compose-filename
+      local-plugin-path: sitectl-isle-source

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-.PHONY: help clean demo-objects sync-solr-conf create-starter-site-pr
+.PHONY: help init up clean reconcile healthcheck test demo-objects sync-solr-conf create-starter-site-pr
 .SILENT:
 
 -include custom.Makefile
@@ -12,7 +12,19 @@ help: ## Show this help message
 	awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "  \033[36m%s\033[0m\t%s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort | column -t -s $$'\t'
 
 clean: ## Delete stateful local data generated by the template
-	./scripts/clean.sh
+	sitectl compose clean
+
+init reconcile: ## Generate or repair declared initialization state
+	sitectl compose reconcile
+
+up: ## Start the complete site and wait for health
+	sitectl compose up --wait
+
+healthcheck: ## Check Compose and application health
+	sitectl healthcheck
+
+test: ## Run the full ISLE template smoke test
+	./scripts/test.sh
 
 demo-objects: ## Add demo objects from https://github.com/Islandora-Devops/islandora_demo_objects
 	./scripts/demo-objects.sh

docker-compose.yml → compose.yaml

@@ -165,18 +165,26 @@ services:
       - source: JWT_PUBLIC_KEY
 
   init:
-    entrypoint: /scripts/init-entrypoint.sh
-    image: libops/base:3.2.2.0@sha256:0c6bab5444d4758bb977a42c1e5199cba733c7776e1aa006f8021108a785c547
+    entrypoint: /bin/bash
+    command: ["-euc", "generate-certs.sh && generate-compose-secrets.sh"]
+    image: libops/base:3.2.2.0@sha256:851e17742b5fee57038855f46b1a46d2716c0012c5f3a4788b7e5c7bc12fed5e
     networks:
       default:
     profiles:
       - none
     restart: "no"
+    working_dir: /work
+    environment:
+      CA_SUBJECT: /CN=LibOps ISLE Local Development CA
+      CERT_DIR: /work/certs
+      COMPOSE_FILE: /work/compose.yaml
+      SECRETS_ROOT: /work/secrets
+      SECRET_FORMAT_DRUPAL_DEFAULT_SALT: salt74
+      SUBJECT_ALT_NAMES: DNS:*.islandora.dev,DNS:islandora.dev,DNS:localhost,IP:127.0.0.1,IP:::1
     volumes:
-      - ./certs:/certs:rw,z
-      - ./secrets:/secrets:rw,z
-      - ./scripts:/scripts:ro,z
-      - ./docker-compose.yml:/docker-compose.yml:ro,z
+      - ./certs:/work/certs:rw,z
+      - ./secrets:/work/secrets:rw,z
+      - ./compose.yaml:/work/compose.yaml:ro,z
 
   mariadb:
     <<: *common
@@ -200,7 +208,7 @@ services:
     depends_on:
       drupal:
         condition: service_healthy
-    image: libops/solr:9@sha256:267504e413f0d2226a734ad3031487dfd3f9ca75c0e3284c7d924eae6388e6b5
+    image: libops/solr:9@sha256:d4f5d06c5cba47677ba96580c1a8b524f26f93c0d05392dc287b34da9ca07d86
     volumes:
       - solr-data:/data:rw
       - read_only: false
@@ -228,7 +236,7 @@ services:
     healthcheck:
       start_period: 10s
       test: traefik healthcheck --ping
-    image: traefik:v3.7.5@sha256:e4d98158c01ad752fc1071d4e9573788747230d902cdde00a772516e692d07c9
+    image: traefik:v3.7.9@sha256:652929a140a32d7cafafb13c6cdfab5376cfeff800f51397b87b524501ed02a8
     networks:
       default:
         aliases: