From 43d367e1cb544ad1e0513fe6664427192a3e08bd Mon Sep 17 00:00:00 2001 From: Valerio Lomanto Date: Wed, 12 Feb 2025 09:38:24 +0100 Subject: [PATCH] fix runner command shell line ends --- .../soc/templates/runner/docker-compose.yml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/global/overlay/etc/puppet/modules/soc/templates/runner/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/soc/templates/runner/docker-compose.yml.erb index 5c4c04e..8fcdc31 100644 --- a/global/overlay/etc/puppet/modules/soc/templates/runner/docker-compose.yml.erb +++ b/global/overlay/etc/puppet/modules/soc/templates/runner/docker-compose.yml.erb @@ -27,8 +27,8 @@ services: command: >- bash -ec ' while : ; do - if [ -f .runner ]; then echo "runner already registered, exiting"; exit; fi - forgejo-runner register --no-interactive --name <%= @networking['fqdn'] %> --instance https://platform.sunet.se --token <%= @runner_token %> --labels <%= @runner_labels %> && break; + if [ -f .runner ]; then echo "runner already registered, exiting"; exit; fi ; + forgejo-runner register --no-interactive --name <%= @networking['fqdn'] %> --instance https://platform.sunet.se --token <%= @runner_token %> --labels <%= @runner_labels %> && break ; sleep 1 ; done ; forgejo-runner generate-config > config.yml ; @@ -55,7 +55,7 @@ services: command: >- bash -ec ' if ! grep "--mount type=bind,source=/certs/client,target=/certs/client,readonly" config.yml > /dev/null; then - sed -i "\|options:| a \ \ \ \ --mount type=bind,source=/certs/client,target=/certs/client,readonly" config.yml - fi - forgejo-runner --config config.yml daemon + sed -i "\|options:| a \ \ \ \ --mount type=bind,source=/certs/client,target=/certs/client,readonly" config.yml ; + fi ; + forgejo-runner --config config.yml daemon ; '