Align sdk image and docs with jdk21 chain

Author: wildone

DEPENDENCY-CHAIN.md

@@ -0,0 +1,91 @@
+# Docker Dependency Chain and Update Process
+
+This document describes how `docker-aem` depends on upstream images and how to safely roll updates through the chain.
+
+## Chain Overview
+
+Release order (bottom to top):
+
+1. `aemdesign/oracle-jdk:jdk21`
+2. `aemdesign/java-ffmpeg:jdk21`
+3. `aemdesign/aem-base:jdk21`
+4. `aemdesign/aem:sdk-<sdk-version>`
+
+`docker-aem` is the final SDK image in this chain.
+
+## Current Dependency Map
+
+1. `docker-oracle-jdk`
+   - Builds Oracle JDK runtime image.
+2. `docker-java-ffmpeg`
+   - `FROM aemdesign/oracle-jdk:jdk21`
+   - Adds ffmpeg and media libraries.
+3. `docker-aem-base`
+   - `FROM aemdesign/java-ffmpeg:jdk21`
+   - Adds AEM Forms/system libraries.
+4. `docker-aem`
+   - `FROM aemdesign/aem-base:jdk21`
+   - Adds AEM SDK quickstart and startup config.
+
+## Update Strategy
+
+Always update and release in chain order.
+
+1. Update `docker-oracle-jdk` and publish `jdk21`.
+2. Update `docker-java-ffmpeg` to consume latest `oracle-jdk:jdk21`, then publish `jdk21`.
+3. Update `docker-aem-base` to consume latest `java-ffmpeg:jdk21`, then publish `jdk21`.
+4. Update `docker-aem` for new SDK branch/version and publish `sdk-<sdk-version>`.
+
+Do not skip levels. Each level should build and pass tests before moving to the next.
+
+## Branch and Tag Conventions
+
+1. Runtime/base branches:
+   - `jdk21` for `docker-oracle-jdk`, `docker-java-ffmpeg`, `docker-aem-base`.
+2. AEM SDK branch:
+   - `sdk-<sdk-version>` for `docker-aem` (example: `sdk-2026.2.24464`).
+3. Release tags:
+   - Runtime/base: semantic tag or release tag used by that repo.
+   - AEM SDK: `sdk-<sdk-version>` tag.
+
+## Standard Update Checklist
+
+For each repo in the chain:
+
+1. Update `Dockerfile` base image reference and Java verification labels.
+2. Update CI workflow:
+   - Ensure build step has `id: docker_build` if dive step uses `steps.docker_build.outputs.imageid`.
+   - Ensure test step is enabled and validates Java version.
+3. Update local scripts (`build.ps1`, `debug.ps1`) default tags.
+4. Update README badge/branch/tag text.
+5. Run local smoke checks:
+   - `docker build ...`
+   - `test/run_tests.sh ...`
+6. Push branch and wait for GitHub Actions green.
+7. Create and push release tag.
+8. Confirm image exists in Docker Hub and GHCR.
+
+## `docker-aem` Specific Notes
+
+1. SDK quickstart comes from Google Drive secret (`GOOGLE_DRIVEID_AEM` in workflow).
+2. CIF and Forms packages are optional and handled in separate branches.
+3. Base SDK branch should not require CIF/Forms package downloads.
+4. Full SDK release runbook is in `RELEASE.md`.
+
+## Verification Commands
+
+Example checks after publishing:
+
+```bash
+docker pull aemdesign/oracle-jdk:jdk21
+docker pull aemdesign/java-ffmpeg:jdk21
+docker pull aemdesign/aem-base:jdk21
+docker pull aemdesign/aem:sdk-<sdk-version>
+```
+
+```bash
+docker run --rm aemdesign/oracle-jdk:jdk21 java --version
+docker run --rm aemdesign/java-ffmpeg:jdk21 java --version
+docker run --rm aemdesign/aem-base:jdk21 java --version
+docker run --rm aemdesign/aem:sdk-<sdk-version> java --version
+```

Dockerfile

@@ -1,16 +1,16 @@
-FROM aemdesign/aem-base:jdk17
+FROM aemdesign/aem-base:jdk21
 
 ARG DOCKER_IMAGE_VERSION
 
 MAINTAINER devops <devops@aem.design>
 
 LABEL   os="debian" \
-        java="oracle 17" \
+        java="oracle 21" \
         container.description="aem instance, will run as author unless specified otherwise" \
         version="${DOCKER_IMAGE_VERSION}" \
         imagename="aem" \
         test.command="java --version" \
-        test.command.verify="17."
+        test.command.verify="21."
 
 ARG AEM_JVM_OPTS="-server -Xms1024m -Xmx1024m -XX:MaxDirectMemorySize=256M -XX:+CMSClassUnloadingEnabled -Djava.awt.headless=true -Dorg.apache.felix.http.host=0.0.0.0"
 ARG AEM_JVM_OPTS="${AEM_JVM_OPTS} -XX:+UseParallelGC --add-opens=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED -Dnashorn.args=--no-deprecation-warning"

README.md

@@ -169,6 +169,7 @@ See full documentation: `Get-Help .\get-action-logs.ps1 -Full`
 ### Creating a New Release
 
 See [RELEASE.md](RELEASE.md) for the full release runbook.
+See [DEPENDENCY-CHAIN.md](DEPENDENCY-CHAIN.md) for cross-repository dependency and update order.
 
 Quick tag example:
 
@@ -183,4 +184,3 @@ Tag push automatically builds and publishes versioned Docker images to both regi
 
 See [LICENSE](LICENSE) file for details.
 
-

build.ps1

@@ -2,7 +2,7 @@ Param(
   [string]$LOG_PATH = "${PWD}\logs",
   [string]$LOG_PEFIX = "docker",
   [string]$LOG_SUFFIX = ".log",
-  [string]$TAG = "jdk17",
+  [string]$TAG = "sdk-2026.2.24464",
   [string]$NAME = "aemsdk",
   [string]$FILE = "Dockerfile",
   [string]$GOOGLE_DRIVEID_AEM = "",
@@ -21,4 +21,3 @@ printSectionLine "$COMMAND" "warn"
 
 Invoke-Expression -Command "$COMMAND" | Tee-Object -Append -FilePath "${LOG_FILE}"
 
-

docker-compose.yml

@@ -5,8 +5,8 @@ services:
     build: .
     labels:
       aem.version: "sdk"
-      os.version: "centos 8"
-      java.version: "oracle 11"
+      os.version: "debian"
+      java.version: "oracle 21"
       container.description: "aem instance, will run as author unless specified otherwise"
     hostname: author
     container_name: "authorsdk"

test/run_tests.sh

@@ -95,7 +95,7 @@ printDebug() {
 
 test_usage_java() {
   printLine "Testing java"
-  CHECK="17."
+  CHECK="21."
 
   printLine "Starting Container"