From 1acfda9baeb7bf4b732905fe8299a333bb407474 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 15 Jan 2024 11:53:04 +0100 Subject: [PATCH] feat!: update ubuntu to 24.04 --- .github/workflows/build.yml | 1 - Dockerfile | 2 +- test/Dockerfile.distro | 2 +- test/dart/Dockerfile | 2 +- test/dart/Dockerfile.arm64 | 2 +- test/dotnet/Dockerfile | 2 +- test/dotnet/Dockerfile.arm64 | 2 +- test/erlang/Dockerfile | 2 +- test/erlang/Dockerfile.arm64 | 2 +- test/flutter/Dockerfile | 2 +- test/flutter/Dockerfile.arm64 | 2 +- test/flux/Dockerfile | 2 +- test/flux/Dockerfile.arm64 | 2 +- test/golang/Dockerfile | 2 +- test/golang/Dockerfile.arm64 | 2 +- test/helm/Dockerfile | 2 +- test/helm/Dockerfile.arm64 | 2 +- test/java/Dockerfile | 2 +- test/java/Dockerfile.arm64 | 2 +- test/jb/Dockerfile | 2 +- test/jb/Dockerfile.arm64 | 2 +- test/latest/Dockerfile | 4 ++-- test/latest/Dockerfile.arm64 | 2 +- test/nix/Dockerfile | 2 +- test/nix/Dockerfile.arm64 | 2 +- test/node/Dockerfile | 2 +- test/node/Dockerfile.arm64 | 2 +- test/php/Dockerfile | 2 +- test/php/Dockerfile.arm64 | 2 +- test/powershell/Dockerfile | 2 +- test/powershell/Dockerfile.arm64 | 2 +- test/python/Dockerfile | 2 +- test/python/Dockerfile.arm64 | 2 +- test/ruby/Dockerfile | 2 +- test/ruby/Dockerfile.arm64 | 2 +- test/rust/Dockerfile | 2 +- test/rust/Dockerfile.arm64 | 2 +- test/swift/Dockerfile | 2 +- test/swift/Dockerfile.arm64 | 2 +- 39 files changed, 39 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b80c394b3..1970229761 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -171,7 +171,6 @@ jobs: distro: - focal - jammy - - noble env: TAG: ${{ matrix.distro }} diff --git a/Dockerfile b/Dockerfile index abbc3670c4..558f3ceb68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04@sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc +FROM ghcr.io/containerbase/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 ARG APT_HTTP_PROXY diff --git a/test/Dockerfile.distro b/test/Dockerfile.distro index c06373aadd..d804621eab 100644 --- a/test/Dockerfile.distro +++ b/test/Dockerfile.distro @@ -8,7 +8,7 @@ FROM ghcr.io/containerbase/ubuntu:20.04 AS focal FROM ghcr.io/containerbase/ubuntu:22.04 AS jammy FROM ghcr.io/containerbase/ubuntu:24.04 AS noble -FROM ghcr.io/containerbase/ubuntu:20.04 AS latest +FROM ghcr.io/containerbase/ubuntu:24.04 AS latest #-------------------------------------- # Image: base #-------------------------------------- diff --git a/test/dart/Dockerfile b/test/dart/Dockerfile index 00f492ab07..48ec0d43bf 100644 --- a/test/dart/Dockerfile +++ b/test/dart/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/dart/Dockerfile.arm64 b/test/dart/Dockerfile.arm64 index 56554f4231..ff92258316 100644 --- a/test/dart/Dockerfile.arm64 +++ b/test/dart/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/dotnet/Dockerfile b/test/dotnet/Dockerfile index bdc1b470db..dd75336a0b 100644 --- a/test/dotnet/Dockerfile +++ b/test/dotnet/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/dotnet/Dockerfile.arm64 b/test/dotnet/Dockerfile.arm64 index 46d3502ab6..82afd8a076 100644 --- a/test/dotnet/Dockerfile.arm64 +++ b/test/dotnet/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/erlang/Dockerfile b/test/erlang/Dockerfile index 421d3a714a..18fbc6672d 100644 --- a/test/erlang/Dockerfile +++ b/test/erlang/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/erlang/Dockerfile.arm64 b/test/erlang/Dockerfile.arm64 index ae62681318..bd6934581d 100644 --- a/test/erlang/Dockerfile.arm64 +++ b/test/erlang/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/flutter/Dockerfile b/test/flutter/Dockerfile index a9fbb2e55c..3b45cc0b3c 100644 --- a/test/flutter/Dockerfile +++ b/test/flutter/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/flutter/Dockerfile.arm64 b/test/flutter/Dockerfile.arm64 index 3390f4b71f..05497b4cca 100644 --- a/test/flutter/Dockerfile.arm64 +++ b/test/flutter/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/flux/Dockerfile b/test/flux/Dockerfile index 14eb2eccb2..6c8dfa7f26 100644 --- a/test/flux/Dockerfile +++ b/test/flux/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/flux/Dockerfile.arm64 b/test/flux/Dockerfile.arm64 index eba3878625..c5e86befac 100644 --- a/test/flux/Dockerfile.arm64 +++ b/test/flux/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/golang/Dockerfile b/test/golang/Dockerfile index c9e6e3cddc..a5583d4612 100644 --- a/test/golang/Dockerfile +++ b/test/golang/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/golang/Dockerfile.arm64 b/test/golang/Dockerfile.arm64 index 9106eecc20..c0eac4a271 100644 --- a/test/golang/Dockerfile.arm64 +++ b/test/golang/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/helm/Dockerfile b/test/helm/Dockerfile index 3186686267..ef808a143e 100644 --- a/test/helm/Dockerfile +++ b/test/helm/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/helm/Dockerfile.arm64 b/test/helm/Dockerfile.arm64 index 8504a2d269..ad4642bea6 100644 --- a/test/helm/Dockerfile.arm64 +++ b/test/helm/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/java/Dockerfile b/test/java/Dockerfile index 19af6cefbf..a3bbbf5e96 100644 --- a/test/java/Dockerfile +++ b/test/java/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/java/Dockerfile.arm64 b/test/java/Dockerfile.arm64 index e4ab92506b..9a5a3fa2c6 100644 --- a/test/java/Dockerfile.arm64 +++ b/test/java/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/jb/Dockerfile b/test/jb/Dockerfile index 7fb5f876f3..2586f8dc5a 100644 --- a/test/jb/Dockerfile +++ b/test/jb/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/jb/Dockerfile.arm64 b/test/jb/Dockerfile.arm64 index 5c2576a783..99cde3d338 100644 --- a/test/jb/Dockerfile.arm64 +++ b/test/jb/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/latest/Dockerfile b/test/latest/Dockerfile index dbabbc8ae0..6081ac1d72 100644 --- a/test/latest/Dockerfile +++ b/test/latest/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] @@ -121,7 +121,7 @@ RUN set -ex; \ #-------------------------------------- # test: gitpod #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS testb-gitpod +FROM ghcr.io/containerbase/ubuntu:24.04 AS testb-gitpod ARG USER_NAME=gitpod ARG USER_ID=33333 diff --git a/test/latest/Dockerfile.arm64 b/test/latest/Dockerfile.arm64 index cc6a709cde..9b3e8fd9be 100644 --- a/test/latest/Dockerfile.arm64 +++ b/test/latest/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/nix/Dockerfile b/test/nix/Dockerfile index 174b30e253..fc32554472 100644 --- a/test/nix/Dockerfile +++ b/test/nix/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/nix/Dockerfile.arm64 b/test/nix/Dockerfile.arm64 index 4ddadccade..64f991b96e 100644 --- a/test/nix/Dockerfile.arm64 +++ b/test/nix/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/node/Dockerfile b/test/node/Dockerfile index cb78e93a4b..0d50db81b0 100644 --- a/test/node/Dockerfile +++ b/test/node/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/node/Dockerfile.arm64 b/test/node/Dockerfile.arm64 index 93c2f5e071..c90e7bb1cf 100644 --- a/test/node/Dockerfile.arm64 +++ b/test/node/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/php/Dockerfile b/test/php/Dockerfile index a9f4984e3f..1a2e80264e 100644 --- a/test/php/Dockerfile +++ b/test/php/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/php/Dockerfile.arm64 b/test/php/Dockerfile.arm64 index fb51094d59..ce372a29e8 100644 --- a/test/php/Dockerfile.arm64 +++ b/test/php/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/powershell/Dockerfile b/test/powershell/Dockerfile index 5d7cfb4a5e..99504dd291 100644 --- a/test/powershell/Dockerfile +++ b/test/powershell/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/powershell/Dockerfile.arm64 b/test/powershell/Dockerfile.arm64 index ab03ea4280..0742f926a6 100644 --- a/test/powershell/Dockerfile.arm64 +++ b/test/powershell/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/python/Dockerfile b/test/python/Dockerfile index f67a232f23..8144b7b886 100644 --- a/test/python/Dockerfile +++ b/test/python/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/python/Dockerfile.arm64 b/test/python/Dockerfile.arm64 index 2aab6af030..897a4676e9 100644 --- a/test/python/Dockerfile.arm64 +++ b/test/python/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/ruby/Dockerfile b/test/ruby/Dockerfile index 1f258cdb38..5355fd48d0 100644 --- a/test/ruby/Dockerfile +++ b/test/ruby/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/ruby/Dockerfile.arm64 b/test/ruby/Dockerfile.arm64 index 9b8ac4513a..8f0ba4e6be 100644 --- a/test/ruby/Dockerfile.arm64 +++ b/test/ruby/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/rust/Dockerfile b/test/rust/Dockerfile index 6f656382ab..395afd4369 100644 --- a/test/rust/Dockerfile +++ b/test/rust/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/rust/Dockerfile.arm64 b/test/rust/Dockerfile.arm64 index 7d259ea775..3fcc169ce9 100644 --- a/test/rust/Dockerfile.arm64 +++ b/test/rust/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/swift/Dockerfile b/test/swift/Dockerfile index 55c0428c75..696ad084e3 100644 --- a/test/swift/Dockerfile +++ b/test/swift/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"] diff --git a/test/swift/Dockerfile.arm64 b/test/swift/Dockerfile.arm64 index 4c317bd254..df319406db 100644 --- a/test/swift/Dockerfile.arm64 +++ b/test/swift/Dockerfile.arm64 @@ -3,7 +3,7 @@ ARG BASE_IMAGE=containerbase #-------------------------------------- # Image: containerbase #-------------------------------------- -FROM ghcr.io/containerbase/ubuntu:20.04 AS containerbase +FROM ghcr.io/containerbase/ubuntu:24.04 AS containerbase ENV BASH_ENV=/usr/local/etc/env SHELL ["/bin/bash" , "-c"]