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

Merge pull request 'upgrade docker-compose example Forgejo 1.21 & Forgejo runner 3.3.0' (#130) from earl-warren/runner:wip-cleanup into main

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/130
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
This commit is contained in:
earl-warren 2023-12-04 21:40:43 +00:00
commit 5efba83794
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/example-docker-compose.yml
View file

@ -9,7 +9,7 @@ jobs:
example-docker-compose: example-docker-compose:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install docker - name: Install docker
run: | run: |

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

@ -24,19 +24,18 @@ services:
command: [ "dockerd", "-H", "tcp://0.0.0.0:2375", "--tls=false" ] command: [ "dockerd", "-H", "tcp://0.0.0.0:2375", "--tls=false" ]
forgejo: forgejo:
image: codeberg.org/forgejo/forgejo:1.20.4-1 image: codeberg.org/forgejo/forgejo:1.21
command: >- command: >-
bash -c ' bash -c '
/bin/s6-svscan /etc/s6 & /bin/s6-svscan /etc/s6 &
sleep 10 ; sleep 10 ;
su -c "forgejo forgejo-cli actions register --secret {SHARED_SECRET} --labels docker --version 3.0.1" git ; su -c "forgejo forgejo-cli actions register --secret {SHARED_SECRET} --labels docker --version 3.3.0" 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 ;
sleep infinity sleep infinity
' '
environment: environment:
FORGEJO__security__INSTALL_LOCK: "true" FORGEJO__security__INSTALL_LOCK: "true"
FORGEJO__log__LEVEL: "debug" FORGEJO__log__LEVEL: "debug"
FORGEJO__actions__ENABLED: "true"
FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true" FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true"
FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false" FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false"
FORGEJO__repository__DEFAULT_REPO_UNITS: "repo.code,repo.actions" FORGEJO__repository__DEFAULT_REPO_UNITS: "repo.code,repo.actions"
@ -46,7 +45,7 @@ services:
- 8080:3000 - 8080:3000
runner-register: runner-register:
image: code.forgejo.org/forgejo/runner:3.0.1 image: code.forgejo.org/forgejo/runner:3.3.0
links: links:
- docker-in-docker - docker-in-docker
- forgejo - forgejo
@ -58,7 +57,7 @@ services:
command: >- command: >-
bash -ec ' bash -ec '
while : ; do while : ; do
forgejo-runner create-runner-file --instance http://forgejo:3000 --name runner --secret {SHARED_SECRET} && break ; forgejo-runner create-runner-file --connect --instance http://forgejo:3000 --name runner --secret {SHARED_SECRET} && break ;
sleep 1 ; sleep 1 ;
done ; done ;
forgejo-runner generate-config > config.yml ; forgejo-runner generate-config > config.yml ;
@ -68,7 +67,7 @@ services:
' '
runner-daemon: runner-daemon:
image: code.forgejo.org/forgejo/runner:3.0.1 image: code.forgejo.org/forgejo/runner:3.3.0
links: links:
- docker-in-docker - docker-in-docker
- forgejo - forgejo