From eed9ce42f915a03a77d7484333a80a80ff8517b1 Mon Sep 17 00:00:00 2001 From: Valerio Lomanto Date: Mon, 10 Feb 2025 13:48:00 +0100 Subject: [PATCH] change action runner tags --- global/overlay/etc/puppet/modules/soc/manifests/runner.pp | 4 ++++ .../modules/soc/templates/runner/docker-compose.yml.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/modules/soc/manifests/runner.pp b/global/overlay/etc/puppet/modules/soc/manifests/runner.pp index d851869..9d5b53e 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/runner.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/runner.pp @@ -4,6 +4,10 @@ class soc::runner( ) { $runner_token = lookup({ 'name' => 'runner_token.vuln_management_repo', 'default_value' => undef }) + $runner_labels = join([ + "pkthon:docker://nikolaik/python3.12-nodejs23", + "ubuntu-22.04:docker://catthehacker/ubuntu:act-22.04", + ], ',') if $runner_token { 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 d90dab1..5bd72b4 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 @@ -28,7 +28,7 @@ services: 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 python:docker://python:3.12-bookworm && break; + 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 ;