mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2024-11-21 20:27:17 +03:00
upgrade docker-compose example Forgejo 1.21 & Forgejo runner 3.3.0
This commit is contained in:
parent
0273d9dc2d
commit
dc45f96f8e
1 changed files with 5 additions and 6 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue