oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-06-27 16:35:58 +00:00
Code Wiki Activity

fix: forgejo-runner-service.sh must not leak the env to the runner (#461)

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/461
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
earl-warren 2025-01-28 14:54:34 +00:00
commit d89873dda7
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
examples/lxc-systemd/forgejo-runner-service.sh
View file

@ -159,6 +159,7 @@ EOF
function inside() {
local name=$(lxc_name)
# all exported variables must be --unset before running the daemon
lxc-helpers.sh lxc_container_run $name -- sudo --user $LXC_USER_NAME \
INPUTS_SERIAL="$INPUTS_SERIAL" \
INPUTS_LXC_CONFIG="$INPUTS_LXC_CONFIG" \
@ -245,7 +246,16 @@ function daemon() {
rm -f stopped-* killed-*
touch started-running
set +e
timeout --signal=SIGINT --kill-after=$KILL_AFTER $INPUTS_LIFETIME forgejo-runner --config config.yml daemon
timeout --signal=SIGINT --kill-after=$KILL_AFTER $INPUTS_LIFETIME env \
--unset INPUTS_SERIAL \
--unset INPUTS_LXC_CONFIG \
--unset INPUTS_TOKEN \
--unset INPUTS_FORGEJO \
--unset INPUTS_LIFETIME \
--unset KILL_AFTER \
--unset VERBOSE \
--unset HOST \
/usr/local/bin/forgejo-runner --config config.yml daemon
case $? in
0) touch stopped-gracefully ;;
124) touch stopped-timeout ;;
@ -255,7 +265,7 @@ function daemon() {
}
function destroy_and_create() {
stop
stop || true
lxc-helpers.sh lxc_container_destroy $(lxc_name)
lxc_create
}