02df78a9ec
I had the case that an already registered runner was losing it's labels due to a race condition (I think): the compose file was restarted, the runner came up but 10 seconds later, the labels were reset: >If the command is run without --labels, they will be reset, and the runner won’t set them back until it is restarted. The --keep-labels option can be used to preserve the existing labels. I always started all services in the compose file at once, so I never got the idea to restart the runner alone and the runner logs actually always said that the labels where there: > ... with labels: [docker-cli node-bookworm], declared successfully Signed-off-by: jankatins <jankatins@noreply.code.forgejo.org> <!--start release-notes-assistant--> <!--URL:https://code.forgejo.org/forgejo/runner--> - bug fixes - [PR](https://code.forgejo.org/forgejo/runner/pulls/965): <!--number 965 --><!--line 0 --><!--description Zml4OiBBbGxvdyB0aGUgcnVubmVyIHRvIGtlZXAgaXQncyBsYWJlbHM=-->fix: Allow the runner to keep it's labels<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/965 Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org> Co-authored-by: jankatins <jankatins@noreply.code.forgejo.org> Co-committed-by: jankatins <jankatins@noreply.code.forgejo.org>
94 lines
3 KiB
YAML
94 lines
3 KiB
YAML
# Copyright 2024 The Forgejo Authors.
|
|
# SPDX-License-Identifier: MIT
|
|
|
|
#
|
|
# Create a secret with:
|
|
#
|
|
# openssl rand -hex 20
|
|
#
|
|
# Replace all occurrences of {SHARED_SECRET} below with the output.
|
|
#
|
|
# NOTE: a token obtained from the Forgejo web interface cannot be used
|
|
# as a shared secret.
|
|
#
|
|
# Replace {ROOT_PASSWORD} with a secure password
|
|
#
|
|
|
|
volumes:
|
|
docker_certs:
|
|
|
|
services:
|
|
|
|
docker-in-docker:
|
|
image: code.forgejo.org/oci/docker:dind
|
|
hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost
|
|
privileged: true
|
|
environment:
|
|
DOCKER_TLS_CERTDIR: /certs
|
|
DOCKER_HOST: docker-in-docker
|
|
volumes:
|
|
- docker_certs:/certs
|
|
|
|
forgejo:
|
|
image: code.forgejo.org/forgejo/forgejo:11.0
|
|
command: >-
|
|
bash -c '
|
|
/usr/bin/s6-svscan /etc/s6 &
|
|
sleep 10 ;
|
|
su -c "forgejo forgejo-cli actions register --keep-labels --secret {SHARED_SECRET}" git ;
|
|
su -c "forgejo admin user create --admin --username root --password {ROOT_PASSWORD} --email root@example.com" git ;
|
|
sleep infinity
|
|
'
|
|
environment:
|
|
FORGEJO__security__INSTALL_LOCK: "true"
|
|
FORGEJO__log__LEVEL: "debug"
|
|
FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true"
|
|
FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false"
|
|
FORGEJO__repository__DEFAULT_REPO_UNITS: "repo.code,repo.actions"
|
|
volumes:
|
|
- /srv/forgejo-data:/data
|
|
ports:
|
|
- 8080:3000
|
|
|
|
runner-register:
|
|
image: code.forgejo.org/forgejo/runner:9.1.1
|
|
links:
|
|
- docker-in-docker
|
|
- forgejo
|
|
environment:
|
|
DOCKER_HOST: tcp://docker-in-docker:2376
|
|
volumes:
|
|
- /srv/runner-data:/data
|
|
user: 0:0
|
|
command: >-
|
|
bash -ec '
|
|
while : ; do
|
|
forgejo-runner create-runner-file --connect --instance http://forgejo:3000 --name runner --secret {SHARED_SECRET} && break ;
|
|
sleep 1 ;
|
|
done ;
|
|
sed -i -e "s|\"labels\": null|\"labels\": [\"docker-cli:docker://code.forgejo.org/oci/docker:cli\",\"node-bookworm:docker://code.forgejo.org/oci/node:20-bookworm\"]|" .runner ;
|
|
forgejo-runner generate-config > config.yml ;
|
|
sed -i -e "s| level: info| level: debug|" config.yml ;
|
|
sed -i -e "s|network: .*|network: host|" config.yml ;
|
|
sed -i -e "s|^ envs:$$| envs:\n DOCKER_HOST: tcp://docker:2376\n DOCKER_TLS_VERIFY: 1\n DOCKER_CERT_PATH: /certs/client|" config.yml ;
|
|
sed -i -e "s|^ options:| options: -v /certs/client:/certs/client|" config.yml ;
|
|
sed -i -e "s| valid_volumes: \[\]$$| valid_volumes:\n - /certs/client|" config.yml ;
|
|
chown -R 1000:1000 /data
|
|
'
|
|
|
|
runner-daemon:
|
|
image: code.forgejo.org/forgejo/runner:9.1.1
|
|
links:
|
|
- docker-in-docker
|
|
- forgejo
|
|
environment:
|
|
DOCKER_HOST: tcp://docker:2376
|
|
DOCKER_CERT_PATH: /certs/client
|
|
DOCKER_TLS_VERIFY: "1"
|
|
volumes:
|
|
- /srv/runner-data:/data
|
|
- docker_certs:/certs
|
|
command: >-
|
|
bash -c '
|
|
while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done
|
|
'
|