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 ac67c23 commit 26b3d9b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
5 changes: 2 additions & 3 deletions taskcluster/docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:24.04
LABEL maintainer="Mozilla Release Engineering <[email protected]>"

# Add worker user with the home directory /builds/worker and bash as the default shell.
Expand Down Expand Up @@ -28,6 +28,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 +45,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
3 changes: 1 addition & 2 deletions taskcluster/docker/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ RUN apt-get update -qq \
python3.10-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 26b3d9b

Please sign in to comment.