chore: extend demo build to allow using the local jinks dev version

Author: wolfgangmm

.dockerignore

@@ -2,4 +2,8 @@
 .devcontainer/
 .github/
 .vscode/
-local.build.properties
+local.build.properties
+node_modules/
+build/
+demo/*.xar
+demo/chunks/

Dockerfile

@@ -4,9 +4,9 @@ ARG PUBLISHER_VERSION=10.0.0
 
 FROM ghcr.io/eeditiones/builder:latest AS builder
 
-ARG ROUTER_VERSION=1.12.1
+ARG ROUTER_VERSION=1.13.1
 ARG CRYPTO_VERSION=6.0.1
-ARG JWT_VERSION=2.0.1
+ARG JWT_VERSION=2.0.2
 
 WORKDIR /tmp
 
@@ -25,8 +25,8 @@ RUN  cd jinks \
     && ant
 
 ADD https://exist-db.org/exist/apps/public-repo/public/expath-crypto-module-${CRYPTO_VERSION}.xar 001.xar
-ADD http://exist-db.org/exist/apps/public-repo/public/roaster-${ROUTER_VERSION}.xar 002.xar
-ADD http://exist-db.org/exist/apps/public-repo/public/jwt-${JWT_VERSION}.xar 003.xar
+ADD https://exist-db.org/exist/apps/public-repo/public/roaster-${ROUTER_VERSION}.xar 002.xar
+ADD https://exist-db.org/exist/apps/public-repo/public/jwt-${JWT_VERSION}.xar 003.xar
 
 FROM duncdrum/existdb:${EXIST_VERSION} AS build_local
 

demo/Dockerfile.demo

@@ -3,8 +3,10 @@
 # The workflow will generate these XARs before building this image
 
 ARG JINKS_VERSION=latest
+# docker-bake.hcl overrides this to build on a jinks image from the local checkout
+ARG JINKS_BASE=ghcr.io/eeditiones/jinks:${JINKS_VERSION}
 
-FROM ghcr.io/eeditiones/jinks:${JINKS_VERSION}
+FROM ${JINKS_BASE}
 
 # Copy all XAR files from build context (generated by workflow)
 # The build context is set to demo/ directory, so XARs are in the current directory

demo/README.md

@@ -48,6 +48,8 @@ IMAGE=wolfgangmm/tei-publisher-home:latest \
   ./build.sh
 ```
 
+Whenever jinks is built from this checkout (the default, or `PRODUCTION=true LOCAL=true`), the final image is built with `docker buildx bake` (`docker-bake.hcl`): it builds jinks from `../Dockerfile` for every requested platform and uses it as the base of `Dockerfile.demo`, so the jinks app inside the demo image matches the checkout. With `PRODUCTION=true` alone, the base is the published `ghcr.io/eeditiones/jinks:latest` (always re-pulled).
+
 `PRODUCTION=true` requires Docker, `opm`, and `xst` on the PATH. Chunking is configured in `opm.toml`. After upload it runs `jinks run tei-publisher sitemap` so `sitemap.xml` is included in the downloaded XAR.
 
 Multi-arch builds use `docker buildx` and must push directly (`PUSH=true`) because Docker cannot load a multi-platform image into the local store. Cross-arch builds emulated via QEMU are slower than native.

demo/build.sh

@@ -4,13 +4,30 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"
 
+<<<<<<< Updated upstream
 DODIS_WALL="${DODIS_WALL:-../../dodis-wall}"
 
+=======
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
 # PRODUCTION=true: use published jinks image, tp_config.prod.json (view-static + sitemap),
 # pre-generate/upload documentation into cached/, and run the sitemap action.
+=======
+DODIS_WALL="${DODIS_WALL:-../../dodis-wall}"
+
+# PRODUCTION=true: use tp_config.prod.json (view-static + sitemap), pre-generate/upload
+# documentation into cached/, and run the sitemap action. Uses the published
+# ghcr.io/eeditiones/jinks:latest image unless LOCAL=true.
+>>>>>>> Stashed changes
 # Default (unset/false): build jinks from this checkout and use tp_config.json
 # without static mode — suitable when opm is not available (e.g. matching CI).
 PRODUCTION="${PRODUCTION:-false}"
+# LOCAL=true: in production mode, build the jinks image from this checkout
+# (../Dockerfile, with its bundled dependencies) instead of pulling latest.
+# This applies both to the server generating the apps and to the base of the
+# final demo image.
+LOCAL="${LOCAL:-false}"
+EXIST_VERSION="${EXIST_VERSION:-6.4.0}"
 
 # Check if npx is available
 if ! command -v npx &> /dev/null; then
@@ -46,18 +63,27 @@ fi
 JINKS_CMD="npx @teipublisher/jinks-cli"
 
 if [ "$PRODUCTION" = "true" ]; then
-    echo "PRODUCTION=true: using ghcr.io/eeditiones/jinks:latest and tp_config.prod.json"
-    docker pull ghcr.io/eeditiones/jinks:latest
-    JINKS_IMAGE="ghcr.io/eeditiones/jinks:latest"
     TP_CONFIG="tp_config.prod.json"
+else
+    TP_CONFIG="tp_config.json"
+fi
+
+if [ "$PRODUCTION" = "true" ] && [ "$LOCAL" != "true" ]; then
+    JINKS_LOCAL=false
+    JINKS_IMAGE="ghcr.io/eeditiones/jinks:latest"
+    echo "PRODUCTION=true: using $JINKS_IMAGE and $TP_CONFIG"
+    docker pull "$JINKS_IMAGE" || { echo "Error: could not pull $JINKS_IMAGE"; exit 1; }
 else
     # Build jinks from this checkout (same as CI). Pulling ghcr.io/eeditiones/jinks:latest
     # leaves the image's already-installed profiles in place, so `jinks create` would keep
     # generating apps from stale templates/config even when this repo has newer ones.
-    echo "PRODUCTION=false: building local jinks image and using tp_config.json"
-    docker build -t jinks-server:local -f ../Dockerfile --build-arg EXIST_VERSION=6.4.0 ..
+    # --pull refreshes the base images (builder, existdb) instead of reusing stale local copies.
+    # The final demo image is built on the same checkout via docker-bake.hcl.
+    JINKS_LOCAL=true
     JINKS_IMAGE="jinks-server:local"
-    TP_CONFIG="tp_config.json"
+    echo "PRODUCTION=$PRODUCTION: building local jinks image, using $TP_CONFIG"
+    docker build --pull -t "$JINKS_IMAGE" -f ../Dockerfile --build-arg EXIST_VERSION="$EXIST_VERSION" .. \
+        || { echo "Error: docker build failed"; exit 1; }
 fi
 
 # Remove existing container if it exists (running or stopped)
@@ -145,23 +171,41 @@ IMAGE="${IMAGE:-jinks-demo}"
 PLATFORMS="${PLATFORMS:-}"
 PUSH="${PUSH:-false}"
 
-if [ -n "$PLATFORMS" ]; then
-    if [ "$PUSH" != "true" ]; then
-        echo "Error: multi-arch builds (PLATFORMS set) require PUSH=true;"
-        echo "Docker cannot load a multi-platform image into the local image store."
-        echo "Example: IMAGE=wolfgangmm/tei-publisher-home:latest PLATFORMS=linux/amd64,linux/arm64 PUSH=true ./build.sh"
-        exit 1
+if [ -n "$PLATFORMS" ] && [ "$PUSH" != "true" ]; then
+    echo "Error: multi-arch builds (PLATFORMS set) require PUSH=true;"
+    echo "Docker cannot load a multi-platform image into the local image store."
+    echo "Example: IMAGE=wolfgangmm/tei-publisher-home:latest PLATFORMS=linux/amd64,linux/arm64 PUSH=true ./build.sh"
+    exit 1
+fi
+
+if [ "$JINKS_LOCAL" = "true" ]; then
+    # Only the demo target gets an output; the jinks target is consumed as its base.
+    if [ -n "$PLATFORMS" ]; then
+        echo "Building multi-arch image ($PLATFORMS) on local jinks and pushing as $IMAGE..."
+        OUTPUT="type=registry"
+    else
+        echo "Building image $IMAGE on local jinks..."
+        OUTPUT="type=docker"
+    fi
+    IMAGE="$IMAGE" PLATFORMS="$PLATFORMS" EXIST_VERSION="$EXIST_VERSION" \
+        docker buildx bake -f docker-bake.hcl --allow=fs.read=.. --set "demo.output=$OUTPUT" demo \
+        || { echo "Error: docker buildx bake failed"; exit 1; }
+    if [ -z "$PLATFORMS" ] && [ "$PUSH" = "true" ]; then
+        echo "Pushing $IMAGE..."
+        docker push "$IMAGE"
     fi
+elif [ -n "$PLATFORMS" ]; then
     echo "Building multi-arch image ($PLATFORMS) and pushing as $IMAGE..."
     docker buildx build \
+        --pull \
         --platform "$PLATFORMS" \
         -f Dockerfile.demo \
         -t "$IMAGE" \
         --push \
         .
 else
     echo "Building image $IMAGE..."
-    docker build -f Dockerfile.demo -t "$IMAGE" .
+    docker build --pull -f Dockerfile.demo -t "$IMAGE" .
     if [ "$PUSH" = "true" ]; then
         echo "Pushing $IMAGE..."
         docker push "$IMAGE"

demo/docker-bake.hcl

@@ -0,0 +1,45 @@
+# Builds the demo image on top of a jinks image built from this checkout,
+# instead of the published ghcr.io/eeditiones/jinks:latest. Used by build.sh
+# whenever it builds jinks locally.
+#
+#   IMAGE=jinks-demo PLATFORMS=linux/amd64,linux/arm64 docker buildx bake demo
+
+variable "IMAGE" {
+  default = "jinks-demo"
+}
+
+# Comma-separated list, e.g. "linux/amd64,linux/arm64". Empty: host platform.
+variable "PLATFORMS" {
+  default = ""
+}
+
+variable "EXIST_VERSION" {
+  default = "6.4.0"
+}
+
+target "_platforms" {
+  platforms = PLATFORMS == "" ? [] : split(",", PLATFORMS)
+}
+
+target "jinks" {
+  inherits   = ["_platforms"]
+  context    = ".."
+  dockerfile = "Dockerfile"
+  args = {
+    EXIST_VERSION = EXIST_VERSION
+  }
+  pull = true
+}
+
+target "demo" {
+  inherits   = ["_platforms"]
+  context    = "."
+  dockerfile = "Dockerfile.demo"
+  args = {
+    JINKS_BASE = "jinks"
+  }
+  contexts = {
+    jinks = "target:jinks"
+  }
+  tags = [IMAGE]
+}