[minor] Use shared base initialization tools

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-.PHONY: help test lint
+.PHONY: help init up clean reconcile healthcheck test lint
 .SILENT:
 
 -include custom.Makefile
@@ -11,6 +11,18 @@ help: ## Show this help message
 	echo 'Available targets:'
 	awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "  \033[36m%s\033[0m\t%s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort | column -t -s $$'\t'
 
+init reconcile: ## Generate or repair declared initialization state
+	sitectl compose reconcile
+
+up: ## Start the complete site and wait for health
+	sitectl compose up --wait
+
+clean: ## Delete generated local state after confirmation
+	sitectl compose clean
+
+healthcheck: ## Check Compose and application health
+	sitectl healthcheck
+
 test: ## Run template checks
 	./scripts/test.sh
 

docker-compose.yaml → compose.yaml

@@ -27,14 +27,18 @@ secrets:
 
 services:
   init:
-    image: libops/base:3.2.2.0@sha256:d4da77a62c6dead3d52c0e0cc4f38647379d7edd8b2be7b17a2cce06d469b545
+    image: libops/base:3.2.2.0@sha256:bd4341e08ac0a34b32e03d01fdc0d0fc8f298d6c1aa63384744056b455dc1511
     restart: no
-    working_dir: /
+    working_dir: /work
+    environment:
+      COMPOSE_FILE: /work/compose.yaml
+      SECRETS_ROOT: /work/secrets
+      SECRET_FORMAT_OJS_SECRET_KEY: laravel-base64
     volumes:
-      - ./secrets:/secrets:rw,z
-      - ./scripts:/scripts:ro,z
-      - ./docker-compose.yaml:/docker-compose.yaml:ro,z
-    command: /scripts/generate-secrets.sh
+      - ./certs:/work/certs:rw,z
+      - ./secrets:/work/secrets:rw,z
+      - ./compose.yaml:/work/compose.yaml:ro,z
+    entrypoint: generate-compose-secrets.sh
     profiles: [none]
 
   traefik:
@@ -94,7 +98,7 @@ services:
       start_period: 10m
 
   database-init:
-    image: libops/base:3.2.2.0@sha256:d4da77a62c6dead3d52c0e0cc4f38647379d7edd8b2be7b17a2cce06d469b545
+    image: libops/base:3.2.2.0@sha256:bd4341e08ac0a34b32e03d01fdc0d0fc8f298d6c1aa63384744056b455dc1511
     restart: "no"
     networks:
       default:
@@ -109,8 +113,6 @@ services:
       - source: DB_ROOT_PASSWORD
       - source: OJS_DB_PASSWORD
         target: DB_PASSWORD
-    volumes:
-      - ./scripts/init-database.sh:/usr/local/bin/init-database.sh:ro,z
     entrypoint: /usr/local/bin/init-database.sh
     depends_on:
       mariadb:

renovate.json5

@@ -3,10 +3,4 @@
   extends: [
     'github>libops/renovate-config:default.json5',
   ],
-  packageRules: [
-    {
-      matchDatasources: ['docker'],
-      groupName: 'container images',
-    },
-  ],
 }