From ef71b2b5d47fcdfd8ad39663926ad095437d1f67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 22:13:19 +0000 Subject: [PATCH 1/5] build(deps): bump ubuntu from 22.04 to 24.04 Dependabot couldn't find the original pull request head commit, f0907ef462cf254887f1e533356ed15394759e73. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49535e1..cb99468 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" From d51be985ab5399181ee1dcc1f27d090df89946e9 Mon Sep 17 00:00:00 2001 From: musicEnfanthen Date: Sat, 1 Feb 2025 23:15:09 +0100 Subject: [PATCH 2/5] ci: update ubuntu version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb99468..62283ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG JAVA_VERSION=17 ARG PRINCE_VERSION=15.3 ARG SAXON_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 From 78fe5c9744aaf42c61cec54270a7e929cfdaf1b4 Mon Sep 17 00:00:00 2001 From: musicEnfanthen Date: Sat, 1 Feb 2025 23:15:40 +0100 Subject: [PATCH 3/5] ci: update Prince --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62283ba..e1b5e89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ 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 PRINCE_VERSION=15.4.1 ARG SAXON_VERSION=SaxonHE12-5 ARG SCHEMATRON_VERSION=8.0.0 ARG UBUNTU_VERSION=24.04 From 504f89806f26ff2a89945e8264eb6229e594e9e7 Mon Sep 17 00:00:00 2001 From: musicEnfanthen Date: Sat, 1 Feb 2025 23:40:08 +0100 Subject: [PATCH 4/5] ci: update saxon arg name --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e1b5e89..1633202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ LABEL org.opencontainers.image.revision="v0.0.1" ARG JAVA_VERSION=17 ARG PRINCE_VERSION=15.4.1 -ARG SAXON_VERSION=SaxonHE12-5 +ARG SAXON_EDITION_VERSION=SaxonHE12-5 ARG SCHEMATRON_VERSION=8.0.0 ARG UBUNTU_VERSION=24.04 ARG XERCES_VERSION=26.1.0.1 @@ -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 From fec188872f45e41c2260097e3874835f1e1344d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCnnich?= Date: Thu, 13 Feb 2025 16:20:26 +0100 Subject: [PATCH 5/5] ci: update dockerimage.yml --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: