From c4c0ca0b433d605e265e539a14baa38dc24af312 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 18 Apr 2025 08:14:31 +0000 Subject: [PATCH] fix: use v11 for the docker-compose example (#542) It matters because /bin/s6-svscan changed to /usr/bin/s6-svscan from v10 to v11 and it would fail in a confusing way if the admin tries to upgrade from v9 to v11. Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/542 Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- .forgejo/workflows/test.yml | 4 ++-- examples/docker-compose/compose-forgejo-and-runner.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index c5aec79..a762723 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -11,7 +11,7 @@ env: FORGEJO_ADMIN_PASSWORD: 'admin1234' FORGEJO_RUNNER_SECRET: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' FORGEJO_SCRIPT: | - /bin/s6-svscan /etc/s6 & sleep 10 ; su -c "forgejo admin user create --admin --username $FORGEJO_ADMIN_USER --password $FORGEJO_ADMIN_PASSWORD --email root@example.com" git && su -c "forgejo forgejo-cli actions register --labels docker --name therunner --secret $FORGEJO_RUNNER_SECRET" git && sleep infinity + /usr/bin/s6-svscan /etc/s6 & sleep 10 ; su -c "forgejo admin user create --admin --username $FORGEJO_ADMIN_USER --password $FORGEJO_ADMIN_PASSWORD --email root@example.com" git && su -c "forgejo forgejo-cli actions register --labels docker --name therunner --secret $FORGEJO_RUNNER_SECRET" git && sleep infinity GOPROXY: https://goproxy.io,direct jobs: @@ -24,7 +24,7 @@ jobs: services: forgejo: - image: codeberg.org/forgejo/forgejo:9 + image: codeberg.org/forgejo/forgejo:11 env: FORGEJO__security__INSTALL_LOCK: "true" FORGEJO__log__LEVEL: "debug" diff --git a/examples/docker-compose/compose-forgejo-and-runner.yml b/examples/docker-compose/compose-forgejo-and-runner.yml index 4028d08..5d3040b 100644 --- a/examples/docker-compose/compose-forgejo-and-runner.yml +++ b/examples/docker-compose/compose-forgejo-and-runner.yml @@ -30,10 +30,10 @@ services: - docker_certs:/certs forgejo: - image: codeberg.org/forgejo/forgejo:9.0 + image: codeberg.org/forgejo/forgejo:11.0 command: >- bash -c ' - /bin/s6-svscan /etc/s6 & + /usr/bin/s6-svscan /etc/s6 & sleep 10 ; su -c "forgejo forgejo-cli actions register --secret {SHARED_SECRET}" git ; su -c "forgejo admin user create --admin --username root --password {ROOT_PASSWORD} --email root@example.com" git ; @@ -51,7 +51,7 @@ services: - 8080:3000 runner-register: - image: code.forgejo.org/forgejo/runner:6.0.1 + image: code.forgejo.org/forgejo/runner:6.3.1 links: - docker-in-docker - forgejo @@ -77,7 +77,7 @@ services: ' runner-daemon: - image: code.forgejo.org/forgejo/runner:6.0.1 + image: code.forgejo.org/forgejo/runner:6.3.1 links: - docker-in-docker - forgejo