From a4350d0fc2cff5c8dc889e144f7ca94b80a153f2 Mon Sep 17 00:00:00 2001 From: alex-mozejko <71618621+alex-mozejko@users.noreply.github.com> Date: Sun, 7 Feb 2021 16:21:10 +0800 Subject: [PATCH] bug-fix: patched dir owned by runner (#284) * bug-fix: patched dir owned by runner * always build with latest runner version * Revert "always build with latest runner version" This reverts commit e719724ae9fe92a12d4a087185cf2a2ff543a0dd. * Also patch dindrunner.Dockerfile Co-authored-by: Yusuke Kuoka --- runner/Dockerfile | 2 +- runner/dindrunner.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runner/Dockerfile b/runner/Dockerfile index c24d79d0..be937f41 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -83,7 +83,7 @@ RUN echo AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache > .env \ && chmod g+rwx /opt/hostedtoolcache COPY entrypoint.sh / -COPY patched $RUNNER_ASSETS_DIR/patched +COPY --chown=runner:docker patched $RUNNER_ASSETS_DIR/patched USER runner ENTRYPOINT ["/usr/local/bin/dumb-init", "--"] diff --git a/runner/dindrunner.Dockerfile b/runner/dindrunner.Dockerfile index 1f068055..801acd5e 100644 --- a/runner/dindrunner.Dockerfile +++ b/runner/dindrunner.Dockerfile @@ -104,7 +104,7 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ VOLUME /var/lib/docker -COPY patched $RUNNER_ASSETS_DIR/patched +COPY --chown=runner:docker patched $RUNNER_ASSETS_DIR/patched # No group definition, as that makes it harder to run docker. USER runner