From 6b996253cfa3c9b4a3b775920e35adb199a29bd8 Mon Sep 17 00:00:00 2001 From: merith-xyz Date: Sat, 28 Sep 2024 10:31:13 -0700 Subject: [PATCH] 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