chore: layout changes

This commit is contained in:
sujiba 2024-05-08 23:01:18 +02:00
parent 83091962a2
commit c67fab85c8
6 changed files with 50 additions and 35 deletions

View file

@ -13,12 +13,13 @@
# as a shared secret.
#
# Replace {ROOT_PASSWORD} with a secure password
services:
# https://code.forgejo.org/forgejo/runner/src/branch/main/examples/docker-compose
docker-in-docker:
image: docker:dind
privileged: true
command: ["dockerd", "-H", "tcp://0.0.0.0:2375", "--tls=false"]
privileged: true
forgejo:
image: codeberg.org/forgejo/forgejo:1.21
@ -40,19 +41,27 @@ services:
volumes:
- ./volumes/forgejo-data:/data
ports:
- 127.0.0.1:13000:3000
- "127.0.0.1:13000:3000"
runner-register:
runner-daemon:
image: code.forgejo.org/forgejo/runner:3.3.0
container_name: forgejo_runner
links:
- docker-in-docker
- forgejo
container_name: forgejo_runner_daemon
command: "forgejo-runner --config config.yml daemon"
environment:
DOCKER_HOST: tcp://docker-in-docker:2375
volumes:
- ./volumes/runner-data:/data
user: 0:0
links:
- docker-in-docker
- forgejo
depends_on:
runner-register:
condition: service_completed_successfully
# runner-register needs only to run at first startup
runner-register:
image: code.forgejo.org/forgejo/runner:3.3.0
container_name: forgejo_runner
command: >-
bash -ec '
while : ; do
@ -64,18 +73,11 @@ services:
sed -i -e "s|labels: \[\]|labels: \[\"docker:docker://alpine:3.18\"\]|" config.yml ;
chown -R 1000:1000 /data
'
runner-daemon:
image: code.forgejo.org/forgejo/runner:3.3.0
container_name: forgejo_runner_daemon
environment:
DOCKER_HOST: tcp://docker-in-docker:2375
volumes:
- ./volumes/runner-data:/data
user: 0:0
links:
- docker-in-docker
- forgejo
environment:
DOCKER_HOST: tcp://docker-in-docker:2375
depends_on:
runner-register:
condition: service_completed_successfully
volumes:
- ./volumes/runner-data:/data
command: "forgejo-runner --config config.yml daemon"