public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <ykuoka@gmail.com>
This commit is contained in:
alex-mozejko 2021-02-07 16:21:10 +08:00 committed by GitHub
parent 2146c62c9e
commit a4350d0fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runner/Dockerfile
View File

@ -83,7 +83,7 @@ RUN echo AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache > .env \
&& chmod g+rwx /opt/hostedtoolcache && chmod g+rwx /opt/hostedtoolcache
COPY entrypoint.sh / COPY entrypoint.sh /
COPY patched $RUNNER_ASSETS_DIR/patched COPY --chown=runner:docker patched $RUNNER_ASSETS_DIR/patched
USER runner USER runner
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"] ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]

2
runner/dindrunner.Dockerfile
View File

@ -104,7 +104,7 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
VOLUME /var/lib/docker 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. # No group definition, as that makes it harder to run docker.
USER runner USER runner