1
0
Fork 0

Make Dockerfile friendlier to layer caching
All checks were successful
/ Test oci-builder (push) Successful in 53s
/ Build oci-builder (push) Successful in 1m3s
/ Release oci-builder (push) Successful in 3s

This commit is contained in:
ver4a 2025-04-21 19:32:07 +02:00
parent ba44ace584
commit a333c03908

View file

@ -1,19 +1,11 @@
FROM quay.io/fedora/fedora-minimal:42 FROM quay.io/fedora/fedora-minimal:42
ARG RUNNER_VERSION=6.3.1
ARG GITHUB_RUN_ID
ENV BUILDAH_ISOLATION=chroot ENV BUILDAH_ISOLATION=chroot
ENV HOME=/builder ENV HOME=/builder
ENV REGISTRY_AUTH_FILE=/builder/.config/containers/auth.json ENV REGISTRY_AUTH_FILE=/builder/.config/containers/auth.json
RUN echo ${GITHUB_RUN_ID} > /.github_run_id
RUN dnf5 -y --setopt install_weak_deps=false install podman buildah skopeo vim setpriv git nodejs22 diffutils gawk RUN dnf5 -y --setopt install_weak_deps=false install podman buildah skopeo vim setpriv git nodejs22 diffutils gawk
RUN curl -sfL https://code.forgejo.org/forgejo/runner/releases/download/v${RUNNER_VERSION}/forgejo-runner-${RUNNER_VERSION}-linux-amd64 -o /usr/local/bin/forgejo-runner
RUN chmod +x /usr/local/bin/forgejo-runner
RUN echo "nobody:65536:65536" > /etc/subuid && echo "nobody:65536:65536" > /etc/subgid RUN echo "nobody:65536:65536" > /etc/subuid && echo "nobody:65536:65536" > /etc/subgid
# This is a workaround for https://github.com/containers/podman/issues/23818, apart from that it serves absolutely no purpose. I also don't know why it looks there, given HOME is elsewhere, but it doesn't seem to cause any issues. # This is a workaround for https://github.com/containers/podman/issues/23818, apart from that it serves absolutely no purpose. I also don't know why it looks there, given HOME is elsewhere, but it doesn't seem to cause any issues.
@ -36,6 +28,15 @@ COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
ARG RUNNER_VERSION=6.3.1
RUN curl -sfL https://code.forgejo.org/forgejo/runner/releases/download/v${RUNNER_VERSION}/forgejo-runner-${RUNNER_VERSION}-linux-amd64 -o /usr/local/bin/forgejo-runner
RUN chmod +x /usr/local/bin/forgejo-runner
ARG GITHUB_RUN_ID
RUN echo ${GITHUB_RUN_ID} > /.github_run_id
USER 65534:65534 USER 65534:65534
WORKDIR /builder WORKDIR /builder