diff --git a/.gitignore b/.gitignore index a3d8610..9e0226e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ playbook.retry *.sw* +.vagrant/ +*.log diff --git a/roles/docker/files/composefiles/gitea.yml b/roles/docker/files/composefiles/gitea.yml index 09081f3..1cec5dd 100644 --- a/roles/docker/files/composefiles/gitea.yml +++ b/roles/docker/files/composefiles/gitea.yml @@ -2,7 +2,8 @@ version: "2.3" networks: gitea: - external: false + external_services: + external: true services: server: @@ -10,9 +11,12 @@ services: environment: - USER_UID=1000 - USER_GID=1000 + - VIRTUAL_HOST=gitea.local + - VIRTUAL_PORT=3000 restart: always networks: - gitea + - external_services volumes: - gitea:/data ports: diff --git a/roles/docker/files/composefiles/nextcloud.yml b/roles/docker/files/composefiles/nextcloud.yml index c37a449..6b21147 100644 --- a/roles/docker/files/composefiles/nextcloud.yml +++ b/roles/docker/files/composefiles/nextcloud.yml @@ -8,11 +8,10 @@ services: environment: - POSTGRES_DB=nextcloud - POSTGRES_USER=nextcloud - + networks: + - nextcloud app: image: nextcloud - ports: - - 8080:80 volumes: - nextcloud:/var/www/html restart: always @@ -21,8 +20,19 @@ services: - POSTGRES_PASSWORD=hest - POSTGRES_DB=nextcloud - POSTGRES_USER=nextcloud - depends_on: + - VIRTUAL_HOST=nextcloud.local + depends_on: - db + ports: + - "80" + networks: + - nextcloud + - external_services volumes: nextcloud: - db: \ No newline at end of file + db: + +networks: + external_services: + external: true + nextcloud: \ No newline at end of file diff --git a/roles/docker/files/composefiles/nginx-proxy.yml b/roles/docker/files/composefiles/nginx-proxy.yml new file mode 100644 index 0000000..b835515 --- /dev/null +++ b/roles/docker/files/composefiles/nginx-proxy.yml @@ -0,0 +1,16 @@ +--- +version: '3' + +services: + nginx-proxy: + image: jwilder/nginx-proxy + ports: + - "80:80" + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro + networks: + - external_services + container_name: nginx-proxy +networks: + external_services: + external: true diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml index 0af5bd9..3ceafcf 100644 --- a/roles/docker/tasks/services.yml +++ b/roles/docker/tasks/services.yml @@ -1,3 +1,13 @@ +- name: setup external services network + docker_network: + name: external_services + +- name: setup nginx reverse proxy + docker_service: + project_name: nginx-proxy + definition: + "{{ lookup('file', 'composefiles/nginx-proxy.yml') | from_yaml }}" + - name: setup gitea docker_service: project_name: gitea