Update Ubuntu to 24.04

Signed-off-by: GitHub <[email protected]>

Dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/ubuntu/ubuntu@sha256:1cc4019c277242e5fb710f2cf40af1590ad053b7d764efba48b051871dcc18d8
+FROM public.ecr.aws/ubuntu/ubuntu@sha256:d55d834bd8b4e1b720fe743ab90a295e8f50ca280aa8c02700a5440461ea160e
 
 LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.authors="Analytical Platform ([email protected])" \
@@ -12,11 +12,11 @@ ENV CONTAINER_USER="analyticalplatform" \
     CONTAINER_GID="1000" \
     DEBIAN_FRONTEND="noninteractive" \
     VISUAL_STUDIO_CODE_VERSION="1.88.1-1712771838" \
-    AWS_CLI_VERSION="2.15.42" \
+    AWS_CLI_VERSION="2.15.43" \
     CORRETTO_VERSION="1:21.0.3.9-1" \
     MINICONDA_VERSION="24.3.0-0" \
-    MINICONDA_SHA256="def595b1b182749df0974cddb5c8befe70664ace16403d7a7bf54467be5ea48b" \
-    DOTNET_SDK_VERSION="8.0.204-1" \
+    MINICONDA_SHA256="96a44849ff17e960eeb8877ecd9055246381c4d4f2d031263b63fa7e2e930af1" \
+    DOTNET_SDK_VERSION="8.0.104-0ubuntu1" \
     OLLAMA_VERSION="0.1.32" \
     OLLAMA_SHA256="539e8e1df2f74263fc56e0939cfc3f014a1addf02b07a06cae5cb42d810eb746" \
     PATH="/opt/conda/bin:${HOME}/.local/bin:${PATH}"
@@ -25,6 +25,9 @@ SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
 
 # User Configuration
 RUN <<EOF
+# Ubuntu have added a user with UID 1000 already, but this is the UID we use in the tooling cluster
+userdel --remove --force ubuntu
+
 groupadd \
   --gid ${CONTAINER_GID} \
   ${CONTAINER_GROUP}
@@ -42,16 +45,16 @@ RUN <<EOF
 apt-get update --yes
 
 apt-get install --yes \
-  "apt-transport-https=2.4.12" \
-  "ca-certificates=20230311ubuntu0.22.04.1" \
-  "curl=7.81.0-1ubuntu1.16" \
-  "git=1:2.34.1-1ubuntu1.10" \
-  "gpg=2.2.27-3ubuntu2.1" \
-  "jq=1.6-2.1ubuntu3" \
+  "apt-transport-https=2.7.14build2" \
+  "ca-certificates=20240203" \
+  "curl=8.5.0-2ubuntu10.1" \
+  "git=1:2.43.0-1ubuntu7" \
+  "gpg=2.4.4-2ubuntu17" \
+  "jq=1.7.1-3build1" \
   "mandoc=1.14.6-1" \
-  "python3.10=3.10.12-1~22.04.3" \
-  "python3-pip=22.0.2+dfsg-1ubuntu0.4" \
-  "unzip=6.0-26ubuntu3.2"
+  "python3.12=3.12.3-1" \
+  "python3-pip=24.0+dfsg-1ubuntu1" \
+  "unzip=6.0-28ubuntu4"
 
 apt-get clean --yes
 
@@ -142,7 +145,7 @@ EOF
 # Miniconda
 RUN <<EOF
 curl --location --fail-with-body \
-  "https://repo.anaconda.com/miniconda/Miniconda3-py310_${MINICONDA_VERSION}-Linux-x86_64.sh" \
+  "https://repo.anaconda.com/miniconda/Miniconda3-py312_${MINICONDA_VERSION}-Linux-x86_64.sh" \
   --output "miniconda.sh"
 
 echo "${MINICONDA_SHA256} miniconda.sh" | sha256sum --check
@@ -157,7 +160,7 @@ EOF
 # .NET SDK
 RUN <<EOF
 curl --location --fail-with-body \
-  "https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb" \
+  "https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb" \
   --output "packages-microsoft-prod.deb"
 
 apt-get install --yes ./packages-microsoft-prod.deb

README.md

@@ -8,7 +8,7 @@ This repository is managed in Terraform [here](https://github.com/ministryofjust
 
 ## Features
 
-The base container image is [Ubuntu 22.04 LTS](https://gallery.ecr.aws/ubuntu/ubuntu).
+The base container image is [Ubuntu 24.04 LTS](https://gallery.ecr.aws/ubuntu/ubuntu).
 
 Additionally the following tools are installed:
 
@@ -48,17 +48,17 @@ Open a browser <http://localhost:8080/?folder=/home/analyticalplatform/workspace
 Generally Dependabot does this, but the following command will return the digest:
 
 ```bash
-docker pull --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:22.04
+docker pull --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:24.04
 
-docker image inspect --format='{{index .RepoDigests 0}}' public.ecr.aws/ubuntu/ubuntu:22.04
+docker image inspect --format='{{index .RepoDigests 0}}' public.ecr.aws/ubuntu/ubuntu:24.04
 ```
 
 ### APT Packages
 
 To find latest APT package versions, you can run the following:
 
 ```bash
-docker run -it --rm --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:22.04
+docker run -it --rm --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:24.04
 
 apt-get update
 
@@ -95,7 +95,7 @@ As of 20/02/24, the GPG public key used for verifying AWS CLI expires 26/07/24,
 The last version of Amazon Corretto can be obtained by running:
 
 ```bash
-docker run -it --rm --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:22.04
+docker run -it --rm --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:24.04
 
 apt-get update
 
@@ -118,21 +118,21 @@ apt-cache policy java-21-amazon-corretto-jdk
 
 ### Miniconda
 
-Releases for Miniconda are maintained on [docs.anaconda.com](https://docs.anaconda.com/free/miniconda/miniconda-release-notes/), from there we can use [repo.anaconda.com](https://repo.anaconda.com/miniconda/) to determine the artefact name and SHA256 based on a version. We currently use `py310`, `Linux` and `x86_64`variant.
+Releases for Miniconda are maintained on [docs.anaconda.com](https://docs.anaconda.com/free/miniconda/miniconda-release-notes/), from there we can use [repo.anaconda.com](https://repo.anaconda.com/miniconda/) to determine the artefact name and SHA256 based on a version. We currently use `py312`, `Linux` and `x86_64`variant.
 
 ### .NET SDK
 
 The latest version of .NET SDK can be obtained by running:
 
 ```bash
-docker run -it --rm --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:22.04
+docker run -it --rm --platform linux/amd64 public.ecr.aws/ubuntu/ubuntu:24.04
 
 apt-get update
 
 apt-get install --yes curl gpg
 
 curl --location --fail-with-body \
-  "https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb" \
+  "https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb" \
   --output "packages-microsoft-prod.deb"
 
 apt-get install --yes ./packages-microsoft-prod.deb

test/container-structure-test.yml

@@ -8,7 +8,7 @@ commandTests:
   - name: "ubuntu"
     command: "grep"
     args: ["DISTRIB_RELEASE", "/etc/lsb-release"]
-    expectedOutput: ["DISTRIB_RELEASE=22.04"]
+    expectedOutput: ["DISTRIB_RELEASE=24.04"]
 
   - name: "whoami"
     command: "whoami"