diff --git a/playbook.yml b/playbook.yml index e537f8d..e8fff2f 100644 --- a/playbook.yml +++ b/playbook.yml @@ -38,27 +38,6 @@ state: directory, mode: 755 } - - { - path: '{{ runner_dir }}', - owner: git, - group: git, - state: directory, - mode: 755 - } - - { - path: '{{ runner_dir }}/.cache', - owner: git, - group: git, - state: directory, - mode: 2775 - } - - { - path: '{{ runner_dir }}/.runner', - owner: git, - group: git, - state: touch, - mode: 2775 - } - name: copy docker-compose file template: @@ -86,7 +65,6 @@ app_dir: '/srv/docker/forgejo' data_dir: '/home/sonny/vm/forgejo/data' postgres_dir: '/home/sonny/vm/forgejo/postgres' - runner_dir: '/home/sonny/vm/forgejo/runner' image_tag: 'codeberg.org/forgejo/forgejo:9' diff --git a/templates/docker-compose.j2 b/templates/docker-compose.j2 index 49dd00a..423fab4 100644 --- a/templates/docker-compose.j2 +++ b/templates/docker-compose.j2 @@ -43,27 +43,3 @@ services: - forgejo volumes: - {{ postgres_dir }}:/var/lib/postgresql/data - - docker-in-docker: - image: docker:dind - privileged: true - container_name: 'docker_dind' - command: ['dockerd', '--host', 'tcp://0.0.0.0:2375', '--tls=false'] - restart: 'unless-stopped' - - # see https://forgejo.org/docs/latest/admin/runner-installation/#oci-image-installation - runner: - image: 'code.forgejo.org/forgejo/runner:3.4.1' - user: 1001:1001 # User without root privileges, but with access to {{ runner_dir }} - command: '/bin/sh -c "sleep 5; forgejo-runner daemon"' - environment: - DOCKER_HOST: tcp://docker-in-docker:2375 - links: - - docker-in-docker - depends_on: - docker-in-docker: - condition: service_started - - volumes: - - {{ runner_dir }}:/data - restart: 'unless-stopped'