From 4c8217cc1e33d3f3934da112268513d554218b55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 03:24:31 +0000 Subject: [PATCH] chore(deps): update dependency ubuntu to v24 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/preview.yaml | 2 +- Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4b373fb..983fed2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 # This seems to work faster than pulling during docker compose up @@ -22,7 +22,7 @@ jobs: run: curl -fI http://localhost:8182/iiif/2/515698v2_fig1.tif/full/full/0/default.jpg build-and-push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: [test] if: github.ref == 'refs/heads/master' steps: diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 39a4aab..16be7dd 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -6,7 +6,7 @@ on: jobs: build-and-push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{ contains(github.event.pull_request.labels.*.name, 'preview') }} steps: - uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index db6edd1..c2339bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG CANTALOUPE_VERSION=5.0.5 # Build -FROM ubuntu:mantic-20240530@sha256:fd7fe639db24c4e005643921beea92bc449aac4f4d40d60cd9ad9ab6456aec01 as build +FROM ubuntu:24.04@sha256:7fdad86e92b1633d13aa4368b4172d51c527151a3de3e67db33f32b5a74702c6 as build ARG DEBIAN_FRONTEND=noninteractive ARG CANTALOUPE_VERSION @@ -61,7 +61,7 @@ RUN cd cantaloupe-src/ && mvn clean package -DskipTests # Package -FROM ubuntu:mantic-20240530@sha256:fd7fe639db24c4e005643921beea92bc449aac4f4d40d60cd9ad9ab6456aec01 as image +FROM ubuntu:24.04@sha256:7fdad86e92b1633d13aa4368b4172d51c527151a3de3e67db33f32b5a74702c6 as image LABEL org.opencontainers.image.source="https://github.com/elifesciences/enhanced-preprints-image-server" ARG CANTALOUPE_VERSION