Migrate aem-base to java-ffmpeg jdk21

Author: wildone

.github/workflows/build.yml

@@ -43,6 +43,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and export to Docker
+        id: docker_build
         uses: docker/build-push-action@v2
         with:
           context: .

Dockerfile

@@ -1,13 +1,13 @@
-FROM        aemdesign/java-ffmpeg:jdk17
+FROM        aemdesign/java-ffmpeg:jdk21
 
 LABEL   os="debian" \
-        java="oracle 17" \
+        java="oracle 21" \
         maintainer="devops <devops@aem.design>" \
         container.description="base image for aem with installed dependencies" \
         version="1.1.0" \
         imagename="aem-base" \
         test.command="java --version" \
-        test.command.verify="17."
+        test.command.verify="21."
 
 ENV TZ=UTC
 

README.md

@@ -1,6 +1,6 @@
 ## AEM Base
 
-[![build](https://github.com/aem-design/docker-aem-base/actions/workflows/build.yml/badge.svg?branch=jdk17)](https://github.com/aem-design/docker-aem-base/actions/workflows/build.yml)
+[![build](https://github.com/aem-design/docker-aem-base/actions/workflows/build.yml/badge.svg?branch=jdk21)](https://github.com/aem-design/docker-aem-base/actions/workflows/build.yml)
 [![github license](https://img.shields.io/github/license/aem-design/aem-base)](https://github.com/aem-design/aem-base) 
 [![github issues](https://img.shields.io/github/issues/aem-design/aem-base)](https://github.com/aem-design/aem-base) 
 [![github last commit](https://img.shields.io/github/last-commit/aem-design/aem-base)](https://github.com/aem-design/aem-base) 
@@ -22,7 +22,7 @@ Images are available on both registries:
 ### Tags
 
 - `latest` - Latest build from main branch
-- `jdk17` - JDK 17 branch
+- `jdk21` - JDK 21 branch
 - Version tags (pushed when git tags are created)
 
 ### Included Packages
@@ -123,4 +123,3 @@ This will automatically build and push versioned Docker images to both registrie
 ## License
 
 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 = "jdk21",
   [string]$NAME = "aem",
   [string]$FILE = "Dockerfile",
   [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1",

docker-compose.yml

@@ -6,6 +6,6 @@ aem-base:
     ffmpeg.version: "2.8.3"
     ffmpeg.plugins: "yasm x264 x265 libogg libopus libvorbis libtheora libvpx libmp3lame faac xvid fdk-aac ffmpeg"
     os.version: "debian"
-    java.version: "oracle 17"
+    java.version: "oracle 21"
     container.description: "aem instance, will run as author unless specified otherwise"
   container_name: "aem-base"

test/run_tests.sh

@@ -6,7 +6,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${1:-aemdesign/aem-base:jdk11}
+IMAGE_NAME=${1:-aemdesign/aem-base:jdk21}
 FLAG_DEBUG=${2:-true}
 IP=$(which ip)
 if [[ -z $IP ]]; then