From 59494a75fea2ecc2d0d2101787932e5ffc72ea58 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Fri, 6 Sep 2024 16:26:44 -0400 Subject: [PATCH 1/2] fix(init): ensure we don't fail if '/builds' already exists in Dockerfile --- taskcluster/docker/fetch/Dockerfile | 4 ++-- taskcluster/docker/run-task/Dockerfile | 2 +- .../taskcluster/docker/linux/Dockerfile | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/taskcluster/docker/fetch/Dockerfile b/taskcluster/docker/fetch/Dockerfile index 41a94170d..4257c6d6d 100644 --- a/taskcluster/docker/fetch/Dockerfile +++ b/taskcluster/docker/fetch/Dockerfile @@ -1,8 +1,8 @@ FROM debian:12-slim -MAINTAINER Release Engineering +LABEL maintainer="Release Engineering " ### Add worker user and setup its workspace. -RUN mkdir /builds && \ +RUN mkdir -p /builds && \ groupadd -g 1000 worker && \ useradd -u 1000 -g 1000 -d /builds/worker -s /bin/bash -m worker && \ mkdir -p /builds/worker/workspace && \ diff --git a/taskcluster/docker/run-task/Dockerfile b/taskcluster/docker/run-task/Dockerfile index 52eb4e40d..2b2036cda 100644 --- a/taskcluster/docker/run-task/Dockerfile +++ b/taskcluster/docker/run-task/Dockerfile @@ -2,7 +2,7 @@ FROM debian:12-slim LABEL maintainer="Release Engineering " # Add worker user -RUN mkdir /builds && \ +RUN mkdir -p /builds && \ useradd -d /builds/worker -s /bin/bash -m worker && \ mkdir /builds/worker/artifacts && \ chown worker:worker /builds/worker/artifacts diff --git a/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile b/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile index d4874c91a..d8538a85e 100644 --- a/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile +++ b/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile @@ -1,8 +1,7 @@ FROM alpine:latest -LABEL maintainer="Mozilla Release Engineering " # Add worker user -RUN mkdir /builds && \ +RUN mkdir -p /builds && \ adduser -h /builds/worker -s /bin/ash -D worker && \ mkdir /builds/worker/artifacts && \ chown worker:worker /builds/worker/artifacts From 3c9c39c8280f752c40edc9a3f5813eda1c7b6b28 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Fri, 6 Sep 2024 16:30:20 -0400 Subject: [PATCH 2/2] fix(init): add coreutils to the 'linux' Dockerfile This includes a version of `env` that is compatible with the `run-task` script. --- .../taskcluster/docker/linux/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile b/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile index d8538a85e..40d2d6275 100644 --- a/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile +++ b/template/{{cookiecutter.project_name}}/taskcluster/docker/linux/Dockerfile @@ -14,7 +14,7 @@ RUN apk add --no-cache python3 py3-pip && \ python3 -m pip install --no-cache --upgrade --break-system-packages pip setuptools # Setup other dependencies -RUN apk add bash git +RUN apk add bash git coreutils # %include-run-task