diff --git a/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml index 72499a3..4ec1610 100644 --- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml +++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-runner/dind-docker.yaml @@ -39,7 +39,7 @@ spec: --token ${RUNNER_SECRET} \ --name ${RUNNER_NAME} \ --instance ${FORGEJO_INSTANCE_URL} \ - --labels docker:docker://node:20-bookworm,ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04,ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04 + --labels docker:docker://node:24-bookworm,ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04,ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-24.04,ubuntu-24.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04 env: - name: RUNNER_NAME valueFrom: @@ -58,7 +58,7 @@ spec: containers: - name: runner image: code.forgejo.org/forgejo/runner:6.4.0 - command: + command: - "sh" - "-c" - | diff --git a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml index 0ae8318..f0cf21a 100644 --- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml @@ -177,16 +177,16 @@ image: fullOverride: observability.buildth.ing/devfw-cicd/edp-forgejo:v11.0.3-edp1 forgejo: - runner: - enabled: true - image: - tag: latest - # replicas: 3 - config: - runner: - labels: - - docker:docker://node:24-bullseye - - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-24.04 - - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04 - - ubuntu-24.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04 - - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-24.04 + # This appears to be governed by forgejo-runner, as intuition would suggest + # runner: + # enabled: true + # image: + # tag: latest + # # replicas: 3 + # config: + # runner: + # labels: + # - docker:docker://node:16-bullseye + # - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04 + # - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04 + # - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04