diff --git a/docker-compose/act-runner/config.yml.j2 b/docker-compose/act-runner/config.yml.j2 new file mode 100644 index 00000000..f4ce8c03 --- /dev/null +++ b/docker-compose/act-runner/config.yml.j2 @@ -0,0 +1,8 @@ +--- +container: + valid_volumes: + - /docker/wiki/site +log: + level: info +runner: + capacity: 4 diff --git a/docker-compose/act-runner/docker-compose.yml.j2 b/docker-compose/act-runner/docker-compose.yml.j2 index 675c9318..db738318 100644 --- a/docker-compose/act-runner/docker-compose.yml.j2 +++ b/docker-compose/act-runner/docker-compose.yml.j2 @@ -1,6 +1,5 @@ --- # https://gitea.com/gitea/act_runner/src/branch/main/examples/docker-compose -version: "3.7" services: runner: container_name: act-runner @@ -8,11 +7,13 @@ services: restart: always volumes: - act_runner_data:/data + - ./config.yml:/config.yml - /var/run/docker.sock:/var/run/docker.sock environment: GITEA_INSTANCE_URL: https://git.mgrote.net GITEA_RUNNER_REGISTRATION_TOKEN: "{{ lookup('viczem.keepass.keepass', 'gitea_act_runner_token', 'password') }}" # only used on first start, https://git.mgrote.net/admin/actions/runners GITEA_RUNNER_NAME: "docker10-act-runner" + CONFIG_FILE: /config.yml volumes: act_runner_data: diff --git a/docker-compose/wiki/docker-compose.yml.j2 b/docker-compose/wiki/docker-compose.yml.j2 index ccfc7ab8..2140f964 100644 --- a/docker-compose/wiki/docker-compose.yml.j2 +++ b/docker-compose/wiki/docker-compose.yml.j2 @@ -9,10 +9,10 @@ services: ports: - 8087:80 volumes: - - /docker/wiki/site:/usr/local/apache2/htdocs/ - # /docker/wiki/site ist ein lokales Verzeichnis auf docker10 - # dieser Verzeichnis wird direkt in der wiki ci gemountet - # und die daten werden dort reingeschrieben + - /docker/wiki/site/site:/usr/local/apache2/htdocs/ + # /docker/wiki/site/site ist ein lokales Verzeichnis auf docker10 + # dieser Verzeichnis wird direkt in der Wiki CI gemountet + # und die Daten werden dort reingeschrieben healthcheck: test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/"] interval: 30s