diff options
| author | Paweł Dybiec <pawel.to.malpa@gmail.com> | 2019-04-17 17:41:04 +0200 |
|---|---|---|
| committer | Paweł Dybiec <pawel.to.malpa@gmail.com> | 2019-04-17 17:41:04 +0200 |
| commit | ff752ea322e6779be90003c369e6c925a35c314f (patch) | |
| tree | 1defb6bb14bd4b0d4342cedb4b03898b2b373c2b | |
| parent | Inline counter app config (diff) | |
Inline nginx conf
| -rw-r--r-- | composer/nginx/docker-compose.yml | 12 | ||||
| -rw-r--r-- | docker.yml | 16 |
2 files changed, 15 insertions, 13 deletions
diff --git a/composer/nginx/docker-compose.yml b/composer/nginx/docker-compose.yml deleted file mode 100644 index 960bfb4..0000000 --- a/composer/nginx/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: '3' -services: - main: - build: . - network_mode: host - volumes: - - "/etc/letsencrypt/live/dybiec.info:/etc/letsencrypt/live/dybiec.info:ro" - - "/etc/letsencrypt/archive/dybiec.info:/etc/letsencrypt/archive/dybiec.info:ro" - ports: - - "443:443" - - "80:80" - restart: always diff --git a/docker.yml b/docker.yml index 47ae3ad..0c27bf5 100644 --- a/docker.yml +++ b/docker.yml @@ -25,7 +25,21 @@ restart: always - name: nginx docker_service: - project_src: composer/nginx + project_name: nginx + definition: + version: '3' + services: + main: + build: "{{docker_compose_dir}}/nginx" + network_mode: host + volumes: + - "/etc/letsencrypt/live/dybiec.info:/etc/letsencrypt/live/dybiec.info:ro" + - "/etc/letsencrypt/archive/dybiec.info:/etc/letsencrypt/archive/dybiec.info:ro" + ports: + - "443:443" + - "80:80" + restart: always + - name: gitea docker_service: project_name: gitea |