From 6be48129f6583ade68cd51f2638254505b3fd8d7 Mon Sep 17 00:00:00 2001 From: faulty Date: Sun, 26 Feb 2023 16:50:47 +0100 Subject: [PATCH] refactor(base): common anchor --- docker-compose.base.yml | 42 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 1d1b074..e18477c 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -5,44 +5,38 @@ networks: proxy: external: true +x-common: &common + restart: always + environment: + - DEFAULT_EMAIL=webmaster@faulty.nl + - DEFAULT_HOST=home.famslof.nl + volumes: + - /srv/.webcerts:/etc/nginx/certs:rw + - /srv/proxy/config/conf.d:/etc/nginx/conf.d + - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d + - /srv/proxy/data/html:/usr/share/nginx/html + - /var/run/docker.sock:/tmp/docker.sock + networks: + proxy: + services: proxy: + <<: *common build: context: custom/proxy container_name: proxy - restart: always privileged: true ports: - 80:80 - 443:443 - volumes: - - /srv/.webcerts:/etc/nginx/certs:rw - - /srv/proxy/config/conf.d:/etc/nginx/conf.d - - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d - - /srv/proxy/data/html:/usr/share/nginx/html - - /var/run/docker.sock:/tmp/docker.sock labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true - networks: - proxy: letsencrypt: + <<: *common container_name: letsencrypt - restart: always image: nginxproxy/acme-companion depends_on: - proxy - volumes: - - /srv/.webcerts:/etc/nginx/certs:rw - - /srv/proxy/config/conf.d:/etc/nginx/conf.d - - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d - - /srv/proxy/data/html:/usr/share/nginx/html - - /var/run/docker.sock:/var/run/docker.sock:ro - environment: - - DEFAULT_EMAIL=webmaster@faulty.nl - - DEFAULT_HOST=home.famslof.nl - #- NGINX_DOCKER_GEN_CONTAINER=proxy - # profiles: - # - production - networks: - proxy: + + \ No newline at end of file