merith-tk/runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

update tests

Browse source
This commit is contained in:
Merith-TK 2024-12-26 00:01:20 +00:00
parent e9634ef5fb
commit 1e466136c9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
entrypoint.sh
View file

@ -81,14 +81,14 @@ if [[ ! -s "${RUNNER__RUNNER__FILE}" ]]; then
if [[ -n "${FORGEJO_SECRET}" ]]; then if [[ -n "${FORGEJO_SECRET}" ]]; then
run_command forgejo-runner create-runner-file --connect \ run_command forgejo-runner create-runner-file --connect \
--instance "${FORGEJO_URL:-http://forgejo:3000}" \ --instance "${FORGEJO_URL:-http://forgejo:3000}" \
--name "${RUNNER_NAME:-$(hostname)}" \ --name "${RUNNER__NAME:-$(hostname)}" \
--secret "${FORGEJO_SECRET}" \ --secret "${FORGEJO_SECRET}" \
${CONFIG_ARG} \ ${CONFIG_ARG} \
${EXTRA_ARGS} 2>&1 | tee /tmp/reg.log ${EXTRA_ARGS} 2>&1 | tee /tmp/reg.log
else else
run_command forgejo-runner register \ run_command forgejo-runner register \
--instance "${FORGEJO_URL:-http://forgejo:3000}" \ --instance "${FORGEJO_URL:-http://forgejo:3000}" \
--name "${RUNNER_NAME:-$(hostname)}" \ --name "${RUNNER__NAME:-$(hostname)}" \
--token "${RUNNER_TOKEN}" \ --token "${RUNNER_TOKEN}" \
--no-interactive \ --no-interactive \
${CONFIG_ARG} \ ${CONFIG_ARG} \

20
examples/docker-compose/compose-forgejo-and-runner.yml
View file

@ -74,19 +74,19 @@ services:
- forgejo - forgejo
- docker-in-docker - docker-in-docker
environment: environment:
CONFIG_FILE: config.yml # defaults to /data/config.yml
DOCKER_HOST: "tcp://docker:2376" # defaults to tcp://docker:2376
DOCKER_CERT_PATH: "/certs/client" # defaults to /certs/client
DOCKER_TLS_VERIFY: "1" # defaults to 1
DOCKER_PRIVILEGED: "true" # defaults to false for security reasons
FORGEJO_URL: ${FORGEJO_URL} # defaults to http://forgejo:3000 FORGEJO_URL: ${FORGEJO_URL} # defaults to http://forgejo:3000
FORGEJO_SECRET: "{SHARED_SECRET}" # shared secret, must match Forgejo's, overrides RUNNER_TOKEN FORGEJO_SECRET: "{SHARED_SECRET}" # shared secret, must match Forgejo's, overrides RUNNER_TOKEN
RUNNER_FILE: .runner # defaults to /data/runner.json
RUNNER_NAME: runner-daemon # defaults to forgejo-runner, used for registration
RUNNER_TOKEN: ${RUNNER_TOKEN} # token obtained from Forgejo web interface RUNNER_TOKEN: ${RUNNER_TOKEN} # token obtained from Forgejo web interface
RUNNER__CONFIG_FILE: config.yml # defaults to /data/config.yml
RUNNER__NAME: forgejo-runner # defaults to forgejo-runner
RUNNER__RUNNER__FILE: .runner # defaults to /data/runner.json
RUNNER__CONTAINER__PRIVILEGED: "true" # defaults to false for security reasons
RUNNER__RUNNER__ENVS: |
DOCKER_HOST=tcp://docker:2376
DOCKER_TLS_VERIFY=1
DOCKER_CERT_PATH=/certs/client # defaults to empty
DEBUG: "true" # defaults to false, set to true to enable debug logging DEBUG: "true" # defaults to false, set to true to enable debug logging
SKIP_WAIT: "false" # defaults to false, set to true to skip the 10 second wait to allow for forgejo and docker-in-docker to start SKIP_WAIT: "false" # defaults to false, set to true to skip the 10 second wait to allow for forgejo and docker-in-docker to start