update forgejo init

This commit is contained in:
Jeff Clement 2025-05-01 11:44:11 -06:00
parent dbe9f65940
commit 5cc8e61a23
Signed by: jeff
GPG key ID: 3BCB43A3F0E1D7DA
2 changed files with 20 additions and 2 deletions

View file

@ -96,6 +96,10 @@ services:
user: 0:0 user: 0:0
command: >- command: >-
bash -ec ' bash -ec '
if [ -f .runner ]; then
echo ".runner file already exists. Exiting."
exit 0
fi
while : ; do while : ; do
forgejo-runner create-runner-file --connect --instance http://server:3000 --name ${RUNNER_NAME} --secret ${SHARED_SECRET} && break ; forgejo-runner create-runner-file --connect --instance http://server:3000 --name ${RUNNER_NAME} --secret ${SHARED_SECRET} && break ;
sleep 1 ; sleep 1 ;
@ -111,7 +115,11 @@ services:
' '
runner-daemon: runner-daemon:
image: code.forgejo.org/forgejo/runner:4.0.1 image: code.forgejo.org/forgejo/runner:${FORGEJO_RUNNER_TAG}
restart: always
depends_on:
- server
- runner-register
links: links:
- docker-in-docker - docker-in-docker
- server - server
@ -130,6 +138,7 @@ services:
docker-in-docker: docker-in-docker:
image: docker:dind image: docker:dind
hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost
restart: always
privileged: true privileged: true
environment: environment:
DOCKER_TLS_CERTDIR: /certs DOCKER_TLS_CERTDIR: /certs

View file

@ -91,6 +91,10 @@ services:
user: 0:0 user: 0:0
command: >- command: >-
bash -ec ' bash -ec '
if [ -f .runner ]; then
echo ".runner file already exists. Exiting."
exit 0
fi
while : ; do while : ; do
forgejo-runner create-runner-file --connect --instance http://server:3000 --name ${RUNNER_NAME} --secret ${SHARED_SECRET} && break ; forgejo-runner create-runner-file --connect --instance http://server:3000 --name ${RUNNER_NAME} --secret ${SHARED_SECRET} && break ;
sleep 1 ; sleep 1 ;
@ -106,10 +110,14 @@ services:
' '
runner-daemon: runner-daemon:
image: code.forgejo.org/forgejo/runner:4.0.1 image: code.forgejo.org/forgejo/runner:${FORGEJO_RUNNER_TAG}
restart: always
links: links:
- docker-in-docker - docker-in-docker
- server - server
depends_on:
- server
- runner-register
environment: environment:
DOCKER_HOST: tcp://docker:2376 DOCKER_HOST: tcp://docker:2376
DOCKER_CERT_PATH: /certs/client DOCKER_CERT_PATH: /certs/client
@ -126,6 +134,7 @@ services:
image: docker:dind image: docker:dind
hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost
privileged: true privileged: true
restart: always
environment: environment:
DOCKER_TLS_CERTDIR: /certs DOCKER_TLS_CERTDIR: /certs
DOCKER_HOST: docker-in-docker DOCKER_HOST: docker-in-docker