From 50c1e8f110ab5a33cc213e7e430b6f48eac7b56b Mon Sep 17 00:00:00 2001
From: Ben Hearsum <ben@mozilla.com>
Date: Fri, 10 Jan 2025 09:32:49 -0500
Subject: [PATCH] upgrade docker images to ubuntu 24.04 to match new worker
 image

---
 taskcluster/docker/base/Dockerfile            | 10 +++++++---
 taskcluster/docker/test/Dockerfile            |  5 ++---
 taskcluster/docker/toolchain-build/Dockerfile |  3 ---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/taskcluster/docker/base/Dockerfile b/taskcluster/docker/base/Dockerfile
index e16718b19..3c13e7f95 100644
--- a/taskcluster/docker/base/Dockerfile
+++ b/taskcluster/docker/base/Dockerfile
@@ -1,6 +1,11 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Mozilla Release Engineering <release+docker@mozilla.com>"
 
+# ubuntu:24.04 has an `ubuntu` user present on it occupying uid 1000
+# we require that uid to make run-task happy
+# https://github.com/taskcluster/taskgraph/blob/588dc4f9cbd88d70c7f55dc6bc830fc023ee75a0/src/taskgraph/run-task/run-task#L310-L319
+RUN userdel ubuntu
+
 # Add worker user with the home directory /builds/worker and bash as the default shell.
 # `/builds` may already exist, `-p` will ensure `mkdir` succeeds regardless
 RUN mkdir -p /builds && \
@@ -28,6 +33,7 @@ RUN apt-get update -qq \
     && apt-get install -y python3 \
                           python3-pip \
                           python3-yaml \
+                          python3-zstandard \
                           locales \
                           git \
                           git-lfs \
@@ -44,8 +50,6 @@ RUN apt-get update -qq \
 
 RUN locale-gen "$LANG"
 
-RUN pip install zstandard
-
 # %include-run-task
 
 # Allow scripts to detect if they are running in docker
diff --git a/taskcluster/docker/test/Dockerfile b/taskcluster/docker/test/Dockerfile
index 9a75824ac..ce6900e5f 100644
--- a/taskcluster/docker/test/Dockerfile
+++ b/taskcluster/docker/test/Dockerfile
@@ -14,13 +14,12 @@ RUN apt-get update -qq \
       libboost-program-options1.74.0 \
       libboost-filesystem1.74.0 \
       libboost-iostreams1.74.0 \
-      python3.10-venv \
+      python3.12-venv \
       pkg-config \
       libicu-dev \
+      python3-poetry \
     && apt-get clean
 
-
-RUN pip install poetry
 # we do not run poetry install here because the tracking package is installed from code
 
 # Install taskfile - https://taskfile.dev/
diff --git a/taskcluster/docker/toolchain-build/Dockerfile b/taskcluster/docker/toolchain-build/Dockerfile
index 099efb786..e78d85d72 100644
--- a/taskcluster/docker/toolchain-build/Dockerfile
+++ b/taskcluster/docker/toolchain-build/Dockerfile
@@ -35,9 +35,6 @@ RUN apt-get update -qq \
 
 RUN locale-gen "$LANG"
 
-RUN pip install zstandard
-
-
 # %include-run-task
 
 ENV SHELL=/bin/bash \