Skip to content

Commit cf49312

Browse files
authored
ci: Use docker slim images where possible (#454)
1 parent 0ac0e59 commit cf49312

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

taskcluster/docker/fetch/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM debian:11
1+
FROM debian:12-slim
2+
MAINTAINER Release Engineering <[email protected]>
23

34
### Add worker user and setup its workspace.
45
RUN mkdir /builds && \

taskcluster/docker/python/Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# License, v. 2.0. If a copy of the MPL was not distributed with this
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

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

88
# Add worker user
99
RUN mkdir /builds && \
@@ -13,8 +13,16 @@ RUN mkdir /builds && \
1313

1414
# %include-run-task
1515

16-
RUN apt-get update && apt-get install -y --force-yes --no-install-recommends \
17-
mercurial build-essential zlib1g-dev libssl-dev git
16+
RUN apt-get update \
17+
&& apt-get install -y --reinstall ca-certificates \
18+
&& apt-get install -y --force-yes --no-install-recommends \
19+
mercurial \
20+
build-essential \
21+
zlib1g-dev \
22+
libssl-dev \
23+
curl \
24+
git \
25+
build-essential zlib1g-dev libffi-dev libssl-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev pkg-config
1826

1927
ENV SHELL=/bin/bash \
2028
HOME=/builds/worker \

taskcluster/docker/skopeo/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN ["/usr/local/go/bin/go", "build", \
2727
"./cmd/umoci"]
2828

2929

30-
FROM debian:buster
30+
FROM debian:12-slim
31+
MAINTAINER Release Engineering <[email protected]>
3132

3233
# %include-run-task
3334

taskcluster/kinds/tests/kind.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,17 @@ tasks:
4848
TOX_PARALLEL_NO_SPINNER: "1"
4949
run:
5050
command: >-
51+
pyenv local 3.12 3.11 3.10 3.9 3.8 &&
5152
pip install --user -r requirements/test.txt --require-hashes &&
5253
pip install --user --no-deps . &&
53-
pyenv local 3.12 3.11 3.10 3.9 3.8 &&
5454
tox --parallel
5555
type-check:
5656
description: "Run type checking against src with Pyright"
5757
treeherder:
5858
symbol: type-check
5959
run:
6060
command: >-
61+
pyenv local 3.12 3.11 3.10 3.9 3.8 &&
6162
pip install --user -r requirements/test.txt --require-hashes &&
6263
pip install --user --no-deps . &&
6364
pyright

taskcluster/scripts/pyenv-setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ git -C "$(pyenv root)" rev-parse HEAD
2323
for i in ${1//,/ }
2424
do
2525
version=$(pyenv latest --known $i)
26-
pyenv install $version
26+
pyenv install $version --verbose
2727
done
2828
chmod 777 /builds/worker/.pyenv/shims
2929
pyenv rehash

0 commit comments

Comments
 (0)