From 17d16b99f5a564ca1601b7dfdb80b53081dc1916 Mon Sep 17 00:00:00 2001 From: Anas Husseini Date: Mon, 20 Nov 2023 18:17:55 +0200 Subject: [PATCH] update .net dockerfiles to use ubuntu 24.04 --- dotnet-aspnet/Dockerfile.24.04 | 4 +--- dotnet-deps/Dockerfile.24.04 | 4 +--- dotnet-runtime/Dockerfile.24.04 | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dotnet-aspnet/Dockerfile.24.04 b/dotnet-aspnet/Dockerfile.24.04 index a7d6a97..d18044d 100644 --- a/dotnet-aspnet/Dockerfile.24.04 +++ b/dotnet-aspnet/Dockerfile.24.04 @@ -8,8 +8,6 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates git file \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* -### TODO: REMOVE "git" and this, once .net8 slices are merged upstream -RUN git clone -b "ubuntu-24.04-proposed" https://github.com/canonical/chisel-releases.git ADD "https://github.com/canonical/chisel/releases/download/v0.8.0/chisel_v0.8.0_linux_${TARGETARCH}.tar.gz" chisel.tar.gz RUN tar -xvf chisel.tar.gz -C /usr/bin/ @@ -17,7 +15,7 @@ ADD "https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapp RUN chmod +x /usr/bin/chisel-wrapper RUN mkdir /rootfs \ - && chisel-wrapper --generate-dpkg-status /status -- --release ./chisel-releases --root /rootfs \ + && chisel-wrapper --generate-dpkg-status /status -- --release "ubuntu-$UBUNTU_RELEASE" --root /rootfs \ base-files_base \ base-files_release-info \ ca-certificates_data \ diff --git a/dotnet-deps/Dockerfile.24.04 b/dotnet-deps/Dockerfile.24.04 index 7a61428..0319464 100644 --- a/dotnet-deps/Dockerfile.24.04 +++ b/dotnet-deps/Dockerfile.24.04 @@ -8,8 +8,6 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates git file \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* -### TODO: REMOVE "git" and this, once .net8 slices are merged upstream -RUN git clone -b "ubuntu-24.04-proposed" https://github.com/canonical/chisel-releases.git ADD "https://github.com/canonical/chisel/releases/download/v0.8.0/chisel_v0.8.0_linux_${TARGETARCH}.tar.gz" chisel.tar.gz RUN tar -xvf chisel.tar.gz -C /usr/bin/ @@ -21,7 +19,7 @@ RUN mkdir -p /rootfs/etc \ && echo -e "root:x:0:\n$GROUP:x:$GID:" >/rootfs/etc/group \ && echo -e "root:x:0:0:root:/root:/noshell\n$USER:x:$UID:$GID::/home/$USER:/noshell" >/rootfs/etc/passwd -RUN chisel-wrapper --generate-dpkg-status /status -- --release ./chisel-releases/ --root /rootfs \ +RUN chisel-wrapper --generate-dpkg-status /status -- --release "ubuntu-$UBUNTU_RELEASE" --root /rootfs \ base-files_base \ base-files_release-info \ ca-certificates_data \ diff --git a/dotnet-runtime/Dockerfile.24.04 b/dotnet-runtime/Dockerfile.24.04 index 9e5d071..8341b7d 100644 --- a/dotnet-runtime/Dockerfile.24.04 +++ b/dotnet-runtime/Dockerfile.24.04 @@ -8,8 +8,6 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates git file \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* -### TODO: REMOVE "git" and this, once .net8 slices are merged upstream -RUN git clone -b "ubuntu-24.04-proposed" https://github.com/canonical/chisel-releases.git ADD "https://github.com/canonical/chisel/releases/download/v0.8.0/chisel_v0.8.0_linux_${TARGETARCH}.tar.gz" chisel.tar.gz RUN tar -xvf chisel.tar.gz -C /usr/bin/ @@ -17,7 +15,7 @@ ADD "https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapp RUN chmod +x /usr/bin/chisel-wrapper RUN mkdir /rootfs \ - && chisel-wrapper --generate-dpkg-status /status -- --release ./chisel-releases --root /rootfs \ + && chisel-wrapper --generate-dpkg-status /status -- --release "ubuntu-$UBUNTU_RELEASE" --root /rootfs \ base-files_base \ base-files_release-info \ ca-certificates_data \