From fc8c46db1da6cdc56a39d3a87393c941fb0e09c6 Mon Sep 17 00:00:00 2001 From: Callum Forrester Date: Wed, 17 Sep 2025 09:08:24 +0000 Subject: [PATCH] fix: Remove requirement for buildkit Fixes https://github.com/DiamondLightSource/python-copier-template/issues/288 Separatet COPY/chmod line into two separate commands so the Dockerfile can be build locally by buildah (podman) as well as CI. --- template/Dockerfile.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/Dockerfile.jinja b/template/Dockerfile.jinja index 121856a0..bc90c8ce 100644 --- a/template/Dockerfile.jinja +++ b/template/Dockerfile.jinja @@ -15,9 +15,9 @@ ENV PATH=/venv/bin:$PATH{% if docker %} # The build stage installs the context into the venv FROM developer AS build # Requires buildkit 0.17.0 -COPY --chmod=o+wrX . /workspaces/{{ repo_name }} +COPY . /workspaces/{{ repo_name }} WORKDIR /workspaces/{{ repo_name }} -RUN touch dev-requirements.txt && pip install -c dev-requirements.txt . +RUN chmod o+wrX . && touch dev-requirements.txt && pip install -c dev-requirements.txt . {% if docker_debug %} FROM build AS debug