From 8e05b3013bfae76e5ed3a712fa403482aa7d29bc Mon Sep 17 00:00:00 2001 From: merith-xyz Date: Sat, 28 Sep 2024 09:28:52 -0700 Subject: [PATCH 1/3] force perms on /srv/runner-data --- .forgejo/workflows/example-docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/example-docker-compose.yml b/.forgejo/workflows/example-docker-compose.yml index 4e2f547..ffb86c0 100644 --- a/.forgejo/workflows/example-docker-compose.yml +++ b/.forgejo/workflows/example-docker-compose.yml @@ -31,6 +31,8 @@ jobs: - name: run the example run: | set -x + mkdir -p /srv/runner-data + chown 1000:1000 /srv/runner-data cd examples/docker-compose secret=$(openssl rand -hex 20) sed -i -e "s/{SHARED_SECRET}/$secret/" compose-forgejo-and-runner.yml From 962c6a62bb76f091a9b710e06e57316975d01d79 Mon Sep 17 00:00:00 2001 From: merith-xyz Date: Sat, 28 Sep 2024 10:10:48 -0700 Subject: [PATCH 2/3] remove orphans - revert if fail --- .forgejo/workflows/example-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/example-docker-compose.yml b/.forgejo/workflows/example-docker-compose.yml index ffb86c0..e84400f 100644 --- a/.forgejo/workflows/example-docker-compose.yml +++ b/.forgejo/workflows/example-docker-compose.yml @@ -40,7 +40,7 @@ jobs: # # Launch Forgejo & the runner # - $cli up -d + $cli up -d --remove-orphans for delay in $(seq 60) ; do test -f /srv/runner-data/.runner && break ; sleep 30 ; done test -f /srv/runner-data/.runner # From 6b996253cfa3c9b4a3b775920e35adb199a29bd8 Mon Sep 17 00:00:00 2001 From: merith-xyz Date: Sat, 28 Sep 2024 10:31:13 -0700 Subject: [PATCH 3/3] nuke network --- .../compose-forgejo-and-runner.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/examples/docker-compose/compose-forgejo-and-runner.yml b/examples/docker-compose/compose-forgejo-and-runner.yml index 6431893..4229d85 100644 --- a/examples/docker-compose/compose-forgejo-and-runner.yml +++ b/examples/docker-compose/compose-forgejo-and-runner.yml @@ -13,11 +13,8 @@ # # Replace ${RUNNER_TOKEN} with the token obtained from the Forgejo web interface. # -# Replace ROOT_PASSWORD with a secure password. +# Replace {ROOT_PASSWORD} with a secure password. # -networks: - forgejo: - volumes: docker_certs: @@ -27,8 +24,6 @@ services: hostname: docker # Must set hostname for both internal DNS and TLS to work as certs are only valid for docker and localhost restart: unless-stopped privileged: true - networks: - - forgejo environment: DOCKER_TLS_CERTDIR: "/certs" # set to "" to disable the use of TLS, also manually update existing runner configs to use port 2375 DOCKER_HOST: "docker" # remove aswell to disable TLS @@ -38,8 +33,6 @@ services: forgejo: image: codeberg.org/forgejo/forgejo:1.21 hostname: forgejo - networks: - - forgejo volumes: - /srv/forgejo-data:/data ports: @@ -50,7 +43,7 @@ services: bash -c ' /bin/s6-svscan /etc/s6 & sleep 10 ; - su -c "forgejo admin user create --admin --username root --password ROOT_PASSWORD --email root@example.com" git ; + su -c "forgejo admin user create --admin --username root --password {ROOT_PASSWORD} --email root@example.com" git ; su -c "forgejo forgejo-cli actions register --secret {SHARED_SECRET}" git ; sleep infinity ' @@ -69,11 +62,12 @@ services: volumes: - /srv/runner-data:/data - docker_certs:/certs - networks: - - forgejo depends_on: - docker-in-docker - forgejo + links: + - forgejo + - docker-in-docker environment: CONFIG_FILE: config.yml # defaults to /data/config.yml