From 90d2d56fec3ad19ac4d3ff14c38d2353c55481ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 20:12:38 +0000 Subject: [PATCH] deps: update dependency ubuntu to v24 --- .github/workflows/check-license.yml | 2 +- .github/workflows/docs-update-reference.yml | 2 +- .github/workflows/links.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/unittests.yml | 2 +- .github/workflows/update-cli-reference.yml | 2 +- .github/workflows/vale.yml | 2 +- dockerfiles/Dockerfile.build-base | 2 +- dockerfiles/Dockerfile.build-base-focal | 2 +- dockerfiles/Dockerfile.coordinator | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index 92504646..b3c83334 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -15,7 +15,7 @@ on: jobs: check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/docs-update-reference.yml b/.github/workflows/docs-update-reference.yml index 60f502b6..8fea1aff 100644 --- a/.github/workflows/docs-update-reference.yml +++ b/.github/workflows/docs-update-reference.yml @@ -7,7 +7,7 @@ on: jobs: pull-request: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml index 5914af8d..b87e9f9a 100644 --- a/.github/workflows/links.yml +++ b/.github/workflows/links.yml @@ -14,7 +14,7 @@ on: jobs: linkChecker: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 16624e24..25b18f36 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ on: jobs: golangci: name: lint - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: ghcr.io/edgelesssys/edgelessrt-dev:ci steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 14fcaebc..3b4f6a6c 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -14,7 +14,7 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: image: ghcr.io/edgelesssys/edgelessrt-dev:ci diff --git a/.github/workflows/update-cli-reference.yml b/.github/workflows/update-cli-reference.yml index 944646cd..1db5588b 100644 --- a/.github/workflows/update-cli-reference.yml +++ b/.github/workflows/update-cli-reference.yml @@ -10,7 +10,7 @@ on: jobs: publish-to-docs: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: image: ghcr.io/edgelesssys/edgelessrt-dev:ci diff --git a/.github/workflows/vale.yml b/.github/workflows/vale.yml index ee222141..f6e495fd 100644 --- a/.github/workflows/vale.yml +++ b/.github/workflows/vale.yml @@ -11,7 +11,7 @@ on: jobs: vale: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/dockerfiles/Dockerfile.build-base b/dockerfiles/Dockerfile.build-base index 7c3943bc..df6df9de 100644 --- a/dockerfiles/Dockerfile.build-base +++ b/dockerfiles/Dockerfile.build-base @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20240808 +FROM ubuntu:24.04 RUN apt-get update && apt-get install -dy --no-install-recommends \ build-essential \ ca-certificates \ diff --git a/dockerfiles/Dockerfile.build-base-focal b/dockerfiles/Dockerfile.build-base-focal index dc8ef648..1fce006d 100644 --- a/dockerfiles/Dockerfile.build-base-focal +++ b/dockerfiles/Dockerfile.build-base-focal @@ -4,7 +4,7 @@ RUN wget \ https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage \ https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64 -FROM ubuntu:focal-20240530 +FROM ubuntu:24.04 COPY --from=download /intel-sgx-deb.key /etc/apt/keyrings/intel-sgx-keyring.asc COPY --from=download /*-x86_64* / RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \ diff --git a/dockerfiles/Dockerfile.coordinator b/dockerfiles/Dockerfile.coordinator index cf44674f..705384a7 100644 --- a/dockerfiles/Dockerfile.coordinator +++ b/dockerfiles/Dockerfile.coordinator @@ -43,7 +43,7 @@ COPY --from=build \ COPY --from=build /mrbuild/marblerun /marblerun-ubuntu-22.04 # the coordinator container image -FROM ubuntu:jammy-20240808 AS release +FROM ubuntu:24.04 AS release ARG PSW_VERSION=2.24.100.3-jammy1 ARG DCAP_VERSION=1.21.100.3-jammy1 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \