Skip to content

Commit 655543e

Browse files
committed
ci: layer the python docker image on top of run-task
1 parent 6b3f414 commit 655543e

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

taskcluster/docker/python/Dockerfile

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,17 @@
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 debian:bookworm-slim
5+
FROM $DOCKER_IMAGE_PARENT
66
LABEL maintainer="Release Engineering <[email protected]>"
77

88
VOLUME /builds/worker/checkouts
99
VOLUME /builds/worker/.task-cache/uv
1010

11-
# Add worker user
12-
RUN mkdir -p /builds && \
13-
useradd -d /builds/worker -s /bin/bash -m worker && \
14-
mkdir /builds/worker/artifacts && \
15-
chown -R worker:worker /builds/worker
16-
17-
# %include-run-task
18-
1911
RUN apt-get update \
20-
&& apt-get install -y --reinstall ca-certificates \
2112
&& apt-get install -y --force-yes --no-install-recommends \
22-
build-essential \
23-
mercurial \
24-
git
13+
build-essential
2514

15+
ENV PATH=/builds/worker/.local/bin:$PATH
2616

27-
ENV SHELL=/bin/bash \
28-
HOME=/builds/worker \
29-
PATH=/builds/worker/.local/bin:$PATH
30-
31-
# %ARG UV_VERSION
32-
COPY --from=ghcr.io/astral-sh/uv:$UV_VERSION /uv /bin/uv
3317
# %ARG PYTHON_VERSIONS
3418
RUN uv python install $PYTHON_VERSIONS
35-
36-
# Set a default command useful for debugging
37-
CMD ["/bin/bash", "--login"]

taskcluster/kinds/docker-image/kind.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
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-
meta:
6-
- &uv_version 0.9.3
7-
85
loader: taskgraph.loader.transform:loader
96

107
transforms:
@@ -28,12 +25,12 @@ tasks:
2825
symbol: I(idx)
2926
python:
3027
symbol: I(py)
28+
parent: run-task
3129
args:
3230
PYTHON_VERSIONS: "3.14t 3.14 3.13 3.12 3.11 3.10 3.9"
33-
UV_VERSION: *uv_version
3431
run-task:
3532
symbol: I(rt)
3633
args:
37-
UV_VERSION: *uv_version
34+
UV_VERSION: "0.9.3"
3835
skopeo:
3936
symbol: I(skopeo)

0 commit comments

Comments
 (0)