Merge branch 'main' into dependabot/docker/ubuntu-24.04

Author: musicEnfanthen

.github/workflows/dockerimage.yml

@@ -28,25 +28,25 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
+        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
+        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
 
       - name: Login to GitHub Container Registry
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: MAIN – Build and push
         if: ${{ github.event_name == 'push' }}
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         with:
           context: .
           file: Dockerfile
@@ -56,7 +56,7 @@ jobs:
 
       - name: PR – build only
         if: ${{ github.event_name == 'pull_request' }}
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
         with:
           context: .
           file: Dockerfile

Dockerfile

@@ -6,17 +6,19 @@ LABEL org.opencontainers.image.authors="https://github.com/kepper"
 LABEL org.opencontainers.image.source="https://github.com/music-encoding/docker-mei"
 LABEL org.opencontainers.image.revision="v0.0.1"
 
-ARG DEBIAN_FRONTEND=noninteractive
 ARG JAVA_VERSION=17
-ARG PRINCE_VERSION=15.1
-ARG SAXON_VERSION=SaxonHE12-4
-ARG TARGETARCH
+ARG PRINCE_VERSION=15.3
+ARG SAXON_VERSION=SaxonHE12-5
+ARG SCHEMATRON_VERSION=8.0.0
 ARG UBUNTU_VERSION=24.04
 ARG XERCES_VERSION=26.1.0.1
+
+ARG TARGETARCH
+ARG DEBIAN_FRONTEND=noninteractive
 ARG DEB_FILE=prince_${PRINCE_VERSION}-1_ubuntu${UBUNTU_VERSION}_${TARGETARCH}.deb
 
 ENV TZ=Europe/Berlin
-ENV ANT_VERSION=1.10.13
+ENV ANT_VERSION=1.10.14
 
 ENV ANT_HOME=/opt/apache-ant-${ANT_VERSION}
 ENV PATH=${PATH}:${ANT_HOME}/bin
@@ -27,6 +29,7 @@ USER root
 ADD https://downloads.apache.org/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz \
     https://github.com/Saxonica/Saxon-HE/releases/download/${SAXON_VERSION}/${SAXON_VERSION}J.zip \
     https://www.oxygenxml.com/maven/com/oxygenxml/oxygen-patched-xerces/${XERCES_VERSION}/oxygen-patched-xerces-${XERCES_VERSION}.jar \
+    https://repo1.maven.org/maven2/com/helger/schematron/ph-schematron-ant-task/${SCHEMATRON_VERSION}/ph-schematron-ant-task-${SCHEMATRON_VERSION}-jar-with-dependencies.jar \
     /tmp/
 
 COPY ["index.js", "package.json", "package-lock.json*", "/opt/docker-mei/"]
@@ -51,6 +54,8 @@ RUN apt-get update && apt-get full-upgrade -y && \
     unzip /tmp/${SAXON_VERSION}J.zip -d ${ANT_HOME}/lib && \
     # setup xerces
     cp /tmp/oxygen-patched-xerces-${XERCES_VERSION}.jar ${ANT_HOME}/lib && \
+    # setup schematron
+    cp /tmp/ph-schematron-ant-task-${SCHEMATRON_VERSION}-jar-with-dependencies.jar ${ANT_HOME}/lib && \
     # cleanup
     apt-get purge -y aptitude apt-utils && \
     apt-get autoremove -y && apt-get clean && \