oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-06-27 16:35:58 +00:00
Code Wiki Activity

fix: use v11 for the docker-compose example (#542)

Browse source 
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 <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
Earl Warren 2025-04-18 08:14:31 +00:00 • committed by earl-warren
parent 62ecfe75b6
commit c4c0ca0b43
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.forgejo/workflows/test.yml
View file

@ -11,7 +11,7 @@ env:
FORGEJO_ADMIN_PASSWORD: 'admin1234' FORGEJO_ADMIN_PASSWORD: 'admin1234'
FORGEJO_RUNNER_SECRET: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' FORGEJO_RUNNER_SECRET: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
FORGEJO_SCRIPT: | 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 GOPROXY: https://goproxy.io,direct
jobs: jobs:
@ -24,7 +24,7 @@ jobs:
services: services:
forgejo: forgejo:
image: codeberg.org/forgejo/forgejo:9 image: codeberg.org/forgejo/forgejo:11
env: env:
FORGEJO__security__INSTALL_LOCK: "true" FORGEJO__security__INSTALL_LOCK: "true"
FORGEJO__log__LEVEL: "debug" FORGEJO__log__LEVEL: "debug"

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

@ -30,10 +30,10 @@ services:
- docker_certs:/certs - docker_certs:/certs
forgejo: forgejo:
image: codeberg.org/forgejo/forgejo:9.0 image: codeberg.org/forgejo/forgejo:11.0
command: >- command: >-
bash -c ' bash -c '
/bin/s6-svscan /etc/s6 & /usr/bin/s6-svscan /etc/s6 &
sleep 10 ; sleep 10 ;
su -c "forgejo forgejo-cli actions register --secret {SHARED_SECRET}" git ; 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 ; su -c "forgejo admin user create --admin --username root --password {ROOT_PASSWORD} --email root@example.com" git ;
@ -51,7 +51,7 @@ services:
- 8080:3000 - 8080:3000
runner-register: runner-register:
image: code.forgejo.org/forgejo/runner:6.0.1 image: code.forgejo.org/forgejo/runner:6.3.1
links: links:
- docker-in-docker - docker-in-docker
- forgejo - forgejo
@ -77,7 +77,7 @@ services:
' '
runner-daemon: runner-daemon:
image: code.forgejo.org/forgejo/runner:6.0.1 image: code.forgejo.org/forgejo/runner:6.3.1
links: links:
- docker-in-docker - docker-in-docker
- forgejo - forgejo