Migrate java-ffmpeg to jdk21 base

Author: wildone

.github/workflows/build.yml

@@ -42,6 +42,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and export to Docker
+        id: docker_build
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -52,9 +53,9 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE }}:${{ env.GIT_BRANCH }}
 
 
-      # - name: test docker image
-      #   run: |
-      #     cd test && bash ./run_tests.sh "$IMAGE:$GIT_BRANCH"
+      - name: test docker image
+        run: |
+          cd test && bash ./run_tests.sh "ghcr.io/$GITHUB_REPOSITORY_OWNER/$IMAGE:$GIT_BRANCH"
 
       - name: Run docker image analysis
         continue-on-error: true

Dockerfile

@@ -1,4 +1,4 @@
-FROM    aemdesign/oracle-jdk:jdk17 as base
+FROM    aemdesign/oracle-jdk:jdk21 as base
 
 RUN     apt-get update -y && \
         apt-get install libgomp1 libxdmcp6 libexpat-dev -y && \
@@ -419,6 +419,7 @@ RUN \
         DIR=$(mktemp -d) && cd ${DIR} && \
         curl -sLO https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-${XCBPROTO_VERSION}.tar.gz && \
         tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \
+        find . -exec touch -d "@$(date +%s)" {} + && \
         ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \
         ./configure --prefix="${PREFIX}" && \
         make && \
@@ -729,14 +730,14 @@ RUN \
 FROM    base
 
 LABEL   os="debian 8" \
-        java="1.8" \
+        java="21" \
         container.description="java and ffmpeg" \
         image.source="https://github.com/jrottenberg/ffmpeg/tree/master/docker-images" \
         version="1.0.0" \
         maintainer="devops <devops@aem.design>" \
         imagename="java-ffmpeg" \
-        test.command=" java -version 2>&1 | grep 'java version' | sed -e 's/.*java version "\(.*\)".*/\1/'" \
-        test.command.verify="1.8"
+        test.command="java --version" \
+        test.command.verify="21."
 
 ENV     LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
 

Dockerfile-debug

@@ -1,4 +1,4 @@
-FROM        aemdesign/oracle-jdk:jdk11 as base
+FROM        aemdesign/oracle-jdk:jdk21 as base
 
 RUN     dnf -y install libgomp && \
         dnf clean all;
@@ -585,8 +585,8 @@ LABEL   os="debian" \
         version="1.0.0" \
         maintainer="devops <devops@aem.design>" \
         imagename="java-ffmpeg" \
-        test.command=" java -version 2>&1 | grep 'java version' | sed -e 's/.*java version "\(.*\)".*/\1/'" \
-        test.command.verify="11."
+        test.command="java --version" \
+        test.command.verify="21."
 
 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
 

Dockerfile-serial

@@ -1,4 +1,4 @@
-FROM    aemdesign/oracle-jdk:jdk11 as base
+FROM    aemdesign/oracle-jdk:jdk21 as base
 
 RUN     apt-get update -y && \
         apt-get install libgomp1 -y && \
@@ -634,13 +634,13 @@ FROM    base
 ENV     LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 
 LABEL   os="debian 8" \
-        java="1.8" \
+        java="21" \
         container.description="java and ffmpeg" \
         image.source="https://github.com/jrottenberg/ffmpeg/tree/master/docker-images" \
         version="1.0.0" \
         maintainer="devops <devops@aem.design>" \
         imagename="java-ffmpeg" \
-        test.command=" java -version 2>&1 | grep 'java version' | sed -e 's/.*java version "\(.*\)".*/\1/'" \
-        test.command.verify="1.8"
+        test.command="java --version" \
+        test.command.verify="21."
 
 COPY    --from=build /usr/local/ /usr/local/

README.md

@@ -1,6 +1,6 @@
 ## Java with FFMPEG
 
-[![build](https://github.com/aem-design/docker-java-ffmpeg/actions/workflows/build.yml/badge.svg?branch=jdk17)](https://github.com/aem-design/docker-java-ffmpeg/actions/workflows/build.yml)
+[![build](https://github.com/aem-design/docker-java-ffmpeg/actions/workflows/build.yml/badge.svg?branch=jdk21)](https://github.com/aem-design/docker-java-ffmpeg/actions/workflows/build.yml)
 [![github license](https://img.shields.io/github/license/aem-design/java-ffmpeg)](https://github.com/aem-design/java-ffmpeg) 
 [![github issues](https://img.shields.io/github/issues/aem-design/java-ffmpeg)](https://github.com/aem-design/java-ffmpeg) 
 [![github last commit](https://img.shields.io/github/last-commit/aem-design/java-ffmpeg)](https://github.com/aem-design/java-ffmpeg) 
@@ -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
@@ -125,4 +125,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 = "jdk11",
+  [string]$TAG = "jdk21",
   [string]$FILE = "Dockerfile",
   [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1",
   [string]$COMMAND = "docker buildx build . -f .\${FILE} -t ${TAG}"
@@ -19,4 +19,3 @@ printSectionLine "$COMMAND" "warn"
 Invoke-Expression -Command "$COMMAND" | Tee-Object -Append -FilePath "${LOG_FILE}"
 
 
-

debug.ps1

@@ -2,7 +2,7 @@ Param(
   [string]$LOG_PATH = "${PWD}\logs",
   [string]$LOG_PEFIX = "docker",
   [string]$LOG_SUFFIX = ".log",
-  [string]$TAG = "jdk11",
+  [string]$TAG = "jdk21",
   [string]$FILE = "Dockerfile",
   [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1",
   [string]$COMMAND = "docker buildx build . -f .\${FILE} -t ${TAG}"

docker-compose.yml

@@ -5,6 +5,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 8"
+    java.version: "oracle 21"
     container.description: "aem instance, will run as author unless specified otherwise"
   container_name: "java-ffmpeg"

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/java-ffmpeg:jdk11}
+IMAGE_NAME=${1:-aemdesign/java-ffmpeg:jdk21}
 FLAG_DEBUG=${2:-true}
 IP=$(which ip)
 if [[ -z $IP ]]; then
@@ -95,7 +95,7 @@ printDebug() {
 
 test_usage_java() {
   printLine "Testing java"
-  CHECK="11"
+  CHECK="$(cat ../Dockerfile | grep -m1 test.command.verify | sed -e 's/.*test.command.verify=\"\(.*\)\".*/\1/g')"
 
   printLine "Starting Container"
 
@@ -130,4 +130,3 @@ test_usage_ffmpeg() {
 test_usage_java
 
 test_usage_ffmpeg
-