Skip to content

Commit

Permalink
upgrade docker images to ubuntu 24.04 to match new worker image
Browse files Browse the repository at this point in the history
  • Loading branch information
bhearsum committed Jan 10, 2025
1 parent e0755ba commit 50c1e8f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 7 additions & 3 deletions taskcluster/docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down Expand Up @@ -28,6 +33,7 @@ RUN apt-get update -qq \
&& apt-get install -y python3 \
python3-pip \
python3-yaml \
python3-zstandard \
locales \
git \
git-lfs \
Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions taskcluster/docker/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 0 additions & 3 deletions taskcluster/docker/toolchain-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ RUN apt-get update -qq \

RUN locale-gen "$LANG"

RUN pip install zstandard


# %include-run-task

ENV SHELL=/bin/bash \
Expand Down

0 comments on commit 50c1e8f

Please sign in to comment.