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

feat: copy dotfiles from asset to service dir (#1136) 

* feat: copy dotfiles from asset to service dir

* Fixed `UNITTEST` Condition

* Load `/etc/environment`

See https://github.com/actions/runner/issues/1703 for context on this change.
This commit is contained in:
Richard Fussenegger 2022-03-18 08:40:52 +01:00 committed by GitHub
parent c06a806d75
commit a68eede616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runner/entrypoint.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
RUNNER_ASSETS_DIR=${RUNNER_ASSETS_DIR:-/runnertmp}
RUNNER_HOME=${RUNNER_HOME:-/runner} RUNNER_HOME=${RUNNER_HOME:-/runner}
LIGHTGREEN="\e[0;32m" LIGHTGREEN="\e[0;32m"
@ -77,10 +78,14 @@ if [ ! -d "${RUNNER_HOME}" ]; then
fi fi
# if this is not a testing environment # if this is not a testing environment
if [ -z "${UNITTEST:-}" ]; then if [[ "${UNITTEST:-}" == '' ]]; then
sudo chown -R runner:docker ${RUNNER_HOME} sudo chown -R runner:docker "$RUNNER_HOME"
# use cp over mv to avoid issues when /runnertmp and {RUNNER_HOME} are on different devices # enable dotglob so we can copy a ".env" file to load in env vars as part of the service startup if one is provided
cp -r /runnertmp/* ${RUNNER_HOME}/ # loading a .env from the root of the service is part of the actions/runner logic
shopt -s dotglob
# use cp instead of mv to avoid issues when src and dst are on different devices
cp -r "$RUNNER_ASSETS_DIR"/* "$RUNNER_HOME"/
shopt -u dotglob
fi fi
cd ${RUNNER_HOME} cd ${RUNNER_HOME}
@ -170,4 +175,12 @@ if [ "${RUNNER_FEATURE_FLAG_EPHEMERAL:-}" != "true" -a "${RUNNER_EPHEMERAL}" !=
fi fi
unset RUNNER_NAME RUNNER_REPO RUNNER_TOKEN unset RUNNER_NAME RUNNER_REPO RUNNER_TOKEN
exec ./bin/runsvc.sh "${args[@]}"
# Docker ignores PAM and thus never loads the system environment variables that
# are meant to be set in every environment of every user. We emulate the PAM
# behavior by reading the environment variables without interpreting them.
#
# https://github.com/actions-runner-controller/actions-runner-controller/issues/1135
# https://github.com/actions/runner/issues/1703
mapfile -t env </etc/environment
exec env -- "${env[@]}" ./bin/runsvc.sh "${args[@]}"