fixup! Enhance ARC runner image dockerfiles for RunnerScaleSet compatibility
This commit is contained in:
parent
f92200ae81
commit
8a8f28f12d
|
|
@ -16,6 +16,18 @@ if [ -n "${STARTUP_DELAY_IN_SECONDS}" ]; then
|
||||||
sleep "${STARTUP_DELAY_IN_SECONDS}"
|
sleep "${STARTUP_DELAY_IN_SECONDS}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! cd "${RUNNER_HOME}"; then
|
||||||
|
log.error "Failed to cd into ${RUNNER_HOME}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# past that point, it's all relative pathes from /runner
|
||||||
|
|
||||||
|
# This is for registering ARC v0 runners.
|
||||||
|
# ARC v1 runners do not need config.sh for registering themselves.
|
||||||
|
# ARC v1 runners are supposed to given the ACTIONS_RUNNER_INPUT_JITCONFIG envvars
|
||||||
|
# so we use it as the trigger to skip config.sh.
|
||||||
|
if [ -z "${ACTIONS_RUNNER_INPUT_JITCONFIG:-}" ]; then
|
||||||
if [ -z "${GITHUB_URL}" ]; then
|
if [ -z "${GITHUB_URL}" ]; then
|
||||||
log.debug 'Working with public GitHub'
|
log.debug 'Working with public GitHub'
|
||||||
GITHUB_URL="https://github.com/"
|
GITHUB_URL="https://github.com/"
|
||||||
|
|
@ -71,13 +83,6 @@ if [[ "${UNITTEST:-}" == '' ]]; then
|
||||||
shopt -u dotglob
|
shopt -u dotglob
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! cd "${RUNNER_HOME}"; then
|
|
||||||
log.error "Failed to cd into ${RUNNER_HOME}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# past that point, it's all relative pathes from /runner
|
|
||||||
|
|
||||||
config_args=()
|
config_args=()
|
||||||
if [ "${RUNNER_FEATURE_FLAG_ONCE:-}" != "true" ] && [ "${RUNNER_EPHEMERAL}" == "true" ]; then
|
if [ "${RUNNER_FEATURE_FLAG_ONCE:-}" != "true" ] && [ "${RUNNER_EPHEMERAL}" == "true" ]; then
|
||||||
config_args+=(--ephemeral)
|
config_args+=(--ephemeral)
|
||||||
|
|
@ -88,11 +93,6 @@ if [ "${DISABLE_RUNNER_UPDATE:-}" == "true" ]; then
|
||||||
log.debug 'Passing --disableupdate to config.sh to disable automatic runner updates.'
|
log.debug 'Passing --disableupdate to config.sh to disable automatic runner updates.'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# This is for registering ARC v0 runners.
|
|
||||||
# ARC v1 runners do not need config.sh for registering themselves.
|
|
||||||
# ARC v1 runners are supposed to given the ACTIONS_RUNNER_INPUT_JITCONFIG envvars
|
|
||||||
# so we use it as the trigger to skip config.sh.
|
|
||||||
if [ -z "${ACTIONS_RUNNER_INPUT_JITCONFIG:-}" ]; then
|
|
||||||
update-status "Registering"
|
update-status "Registering"
|
||||||
|
|
||||||
retries_left=10
|
retries_left=10
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue