diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 079c94c..6d0fa9a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -19,7 +19,7 @@ env: jobs: build-and-push-image: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{ github.repository_owner == 'music-encoding' }} permissions: diff --git a/Dockerfile b/Dockerfile index 49535e1..1633202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 LABEL org.opencontainers.image.authors="https://github.com/riedde" LABEL org.opencontainers.image.authors="https://github.com/bwbohl" @@ -7,10 +7,10 @@ LABEL org.opencontainers.image.source="https://github.com/music-encoding/docker- LABEL org.opencontainers.image.revision="v0.0.1" ARG JAVA_VERSION=17 -ARG PRINCE_VERSION=15.3 -ARG SAXON_VERSION=SaxonHE12-5 +ARG PRINCE_VERSION=15.4.1 +ARG SAXON_EDITION_VERSION=SaxonHE12-5 ARG SCHEMATRON_VERSION=8.0.0 -ARG UBUNTU_VERSION=22.04 +ARG UBUNTU_VERSION=24.04 ARG XERCES_VERSION=26.1.0.1 ARG TARGETARCH @@ -27,7 +27,7 @@ ENV NODE_ENV=production 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://github.com/Saxonica/Saxon-HE/releases/download/${SAXON_EDITION_VERSION}/${SAXON_EDITION_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/ @@ -51,7 +51,7 @@ RUN apt-get update && apt-get full-upgrade -y && \ # setup ant tar -xvf /tmp/apache-ant-${ANT_VERSION}-bin.tar.gz -C /opt && \ # setup saxon - unzip /tmp/${SAXON_VERSION}J.zip -d ${ANT_HOME}/lib && \ + unzip /tmp/${SAXON_EDITION_VERSION}J.zip -d ${ANT_HOME}/lib && \ # setup xerces cp /tmp/oxygen-patched-xerces-${XERCES_VERSION}.jar ${ANT_HOME}/lib && \ # setup schematron