Skip to content

ci: Use docker slim images where possible #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2024
Merged

ci: Use docker slim images where possible #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion taskcluster/docker/fetch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM debian:11
FROM debian:12-slim
MAINTAINER Release Engineering <release@mozilla.com>

### Add worker user and setup its workspace.
RUN mkdir /builds && \
Expand Down
16 changes: 12 additions & 4 deletions taskcluster/docker/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

FROM python:3.9
LABEL maintainer="Andrew Halberstadt <ahal@mozilla.com>"
FROM python:3.12-slim
MAINTAINER Release Engineering <release@mozilla.com>

# Add worker user
RUN mkdir /builds && \
Expand All @@ -13,8 +13,16 @@ RUN mkdir /builds && \

# %include-run-task

RUN apt-get update && apt-get install -y --force-yes --no-install-recommends \
mercurial build-essential zlib1g-dev libssl-dev git
RUN apt-get update \
&& apt-get install -y --reinstall ca-certificates \
&& apt-get install -y --force-yes --no-install-recommends \
mercurial \
build-essential \
zlib1g-dev \
libssl-dev \
curl \
git \
build-essential zlib1g-dev libffi-dev libssl-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev pkg-config

ENV SHELL=/bin/bash \
HOME=/builds/worker \
Expand Down
3 changes: 2 additions & 1 deletion taskcluster/docker/skopeo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ RUN ["/usr/local/go/bin/go", "build", \
"./cmd/umoci"]


FROM debian:buster
FROM debian:12-slim
MAINTAINER Release Engineering <release@mozilla.com>

# %include-run-task

Expand Down
3 changes: 2 additions & 1 deletion taskcluster/kinds/tests/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,17 @@ tasks:
TOX_PARALLEL_NO_SPINNER: "1"
run:
command: >-
pyenv local 3.12 3.11 3.10 3.9 3.8 &&
pip install --user -r requirements/test.txt --require-hashes &&
pip install --user --no-deps . &&
pyenv local 3.12 3.11 3.10 3.9 3.8 &&
tox --parallel
type-check:
description: "Run type checking against src with Pyright"
treeherder:
symbol: type-check
run:
command: >-
pyenv local 3.12 3.11 3.10 3.9 3.8 &&
pip install --user -r requirements/test.txt --require-hashes &&
pip install --user --no-deps . &&
pyright
2 changes: 1 addition & 1 deletion taskcluster/scripts/pyenv-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ git -C "$(pyenv root)" rev-parse HEAD
for i in ${1//,/ }
do
version=$(pyenv latest --known $i)
pyenv install $version
pyenv install $version --verbose
done
chmod 777 /builds/worker/.pyenv/shims
pyenv rehash