Раннер перемещён в override.yml

This commit is contained in:
2025-06-07 16:01:13 +08:00
parent 1fc61b4787
commit e68029086f
2 changed files with 30 additions and 25 deletions

View File

@@ -1,14 +1,34 @@
################################################ x-common-attributes: &common-attributes
# Rename this file to compose.override.yml if env_file: .env
# you need to restore database backups. Also restart: unless-stopped
# you can override another settings here. networks: [network]
################################################ volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
services: services:
gitea-db: # uncomment to import gitea database backup on first start
volumes: # gitea-db:
- ./gitea/dump.sql.gz:/docker-entrypoint-initdb.d/dump.sql.gz # volumes:
# - ./gitea/dump.sql.gz:/docker-entrypoint-initdb.d/dump.sql.gz
opengist-db: # uncomment to import opengist database backup on first start
# opengist-db:
# volumes:
# - ./opengist/dump.sql.gz:/docker-entrypoint-initdb.d/dump.sql.gz
# uncomment to use gitea runner
gitea-runner:
<<: *common-attributes
container_name: gitea-runner
image: docker.io/gitea/act_runner:latest
environment:
CONFIG_FILE: /config.yaml
GITEA_INSTANCE_URL: http://gitea:3000
GITEA_RUNNER_REGISTRATION_TOKEN: ${RUNNER_REG_TOKEN}
GITEA_RUNNER_NAME: gitea-runner
# GITEA_RUNNER_LABELS: ${RUNNER_LABELS}
volumes: volumes:
- ./opengist/dump.sql.gz:/docker-entrypoint-initdb.d/dump.sql.gz - ./runner/config.yaml:/config.yaml
- ./runner/data:/data
- /var/run/docker.sock:/var/run/docker.sock

View File

@@ -36,21 +36,6 @@ services:
depends_on: depends_on:
- gitea-db - gitea-db
gitea-runner:
<<: *common-attributes
container_name: gitea-runner
image: docker.io/gitea/act_runner:latest
environment:
CONFIG_FILE: /config.yaml
GITEA_INSTANCE_URL: http://gitea:3000
GITEA_RUNNER_REGISTRATION_TOKEN: ${RUNNER_REG_TOKEN}
GITEA_RUNNER_NAME: gitea-runner
# GITEA_RUNNER_LABELS: ${RUNNER_LABELS}
volumes:
- ./runner/config.yaml:/config.yaml
- ./runner/data:/data
- /var/run/docker.sock:/var/run/docker.sock
gitea-db: gitea-db:
<<: *common-attributes <<: *common-attributes
container_name: gitea-db container_name: gitea-db