From ed4f2e3cc6cb5b669370dca8347ef0f9363ed57f Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Thu, 26 Oct 2023 04:42:08 +0200 Subject: [PATCH] improve stack detection --- make/apps/def.docker.mk | 6 ++--- make/def.app.mk | 8 +++++- make/def.docker.mk | 2 ++ stack/User/User.yml | 5 ---- stack/User/ipfs.yml | 8 ------ stack/cloud/nextcloud.yml | 8 ------ stack/drone/drone-runner-docker.yml | 5 ---- stack/drone/drone.yml | 8 ------ stack/drone/gc.yml | 5 ---- stack/elastic/apm-server-oss.yml | 8 ------ stack/elastic/apm-server.yml | 8 ------ stack/elastic/curator.yml | 5 ---- stack/elastic/elasticsearch.local.7.4.yml | 1 - stack/elastic/elasticsearch.yml | 8 ------ stack/elastic/kibana-oss.yml | 8 ------ stack/elastic/kibana.yml | 8 ------ stack/grafana/grafana.yml | 8 ------ stack/host/acme.mk | 4 ++- stack/host/acme.yml | 5 ---- stack/host/apache/php5.www.yml | 1 - stack/host/apache/php5.yml | 5 ---- stack/host/backup/restic.yml | 1 - stack/host/exporter/cadvisor.yml | 5 ---- stack/host/exporter/node.yml | 5 ---- stack/host/ftps.mk | 1 + stack/host/ftps.yml | 32 +++++++++++++++++++++++ stack/host/ipfs.home.yml | 1 - stack/host/ipfs.yml | 1 - stack/host/mail.mk | 3 ++- stack/host/mail/mailserver.yml | 7 +---- stack/host/nginx.dns.yml | 1 - stack/host/nginx.www.yml | 1 - stack/host/nginx.yml | 5 ---- stack/host/php.dns.yml | 1 - stack/host/php.www.yml | 1 - stack/host/php.yml | 5 ---- stack/host/portainer.yml | 5 ---- stack/host/static.yml | 5 ---- stack/host/vdi/vdi.yml | 5 ---- stack/host/volumes.dns.local.yml | 9 ------- stack/host/volumes.home.local.yml | 10 ------- stack/host/volumes.log.local.yml | 9 ------- stack/host/volumes.www.local.yml | 9 ------- stack/ipfs/ipfs.yml | 8 ------ stack/memcached/memcached.yml | 5 ---- stack/mysql/mysql.yml | 5 ---- stack/newrelic/php-daemon.yml | 5 ---- stack/nginx/nginx.yml | 8 ------ stack/nginx/static.yml | 8 ------ stack/portainer/portainer.yml | 5 ---- stack/postgres/postgres.yml | 5 ---- stack/prometheus/alertmanager.yml | 8 ------ stack/prometheus/blackbox.yml | 8 ------ stack/prometheus/es-exporter.yml | 8 ------ stack/prometheus/prometheus.yml | 8 ------ stack/rabbitmq/rabbitmq.yml | 8 ------ stack/redis/redis.yml | 8 ------ stack/redmine/redmine.yml | 8 ------ stack/redmine/redmine3.yml | 8 ------ stack/sematext/logagent.yml | 5 ---- stack/theia/theia.yml | 8 ------ stack/x2go/vdi.yml | 8 ------ 62 files changed, 51 insertions(+), 329 deletions(-) create mode 100644 stack/host/ftps.mk create mode 100644 stack/host/ftps.yml delete mode 100644 stack/host/volumes.dns.local.yml delete mode 100644 stack/host/volumes.home.local.yml delete mode 100644 stack/host/volumes.log.local.yml delete mode 100644 stack/host/volumes.www.local.yml diff --git a/make/apps/def.docker.mk b/make/apps/def.docker.mk index f12cab0..f19c768 100644 --- a/make/apps/def.docker.mk +++ b/make/apps/def.docker.mk @@ -1,4 +1,4 @@ -COMPOSE_FILE ?= $(wildcard docker-compose.yml docker/docker-compose.yml $(foreach file,$(patsubst docker/docker-compose.%,%,$(basename $(wildcard docker/docker-compose.*.yml))),$(if $(filter true,$(COMPOSE_FILE_$(file)) $(COMPOSE_FILE_$(call UPPERCASE,$(file)))),docker/docker-compose.$(file).yml))) +COMPOSE_FILE ?= $(STACK_MYOS_FILE) $(wildcard docker-compose.yml docker/docker-compose.yml $(foreach file,$(patsubst docker/docker-compose.%,%,$(basename $(wildcard docker/docker-compose.*.yml))),$(if $(filter true,$(COMPOSE_FILE_$(file)) $(COMPOSE_FILE_$(call UPPERCASE,$(file)))),docker/docker-compose.$(file).yml))) COMPOSE_FILE_$(ENV) ?= true COMPOSE_FILE_DEBUG ?= $(if $(DEBUG),true) COMPOSE_FILE_MYOS ?= true @@ -135,8 +135,8 @@ define docker-stack-update $(eval stack := $(patsubst %.yml,%,$(notdir $(1)))) $(eval name := $(firstword $(subst :, ,$(stack)))) $(eval version := $(or $(2),$(if $(findstring :,$(stack)),$(lastword $(subst :, ,$(stack))),latest))) - $(eval path := $(patsubst %/,%,$(or $(3),$(if $(findstring /,$(1)),$(if $(wildcard stack/$(1) stack/$(1).yml),stack/$(if $(findstring .yml,$(1)),$(dir $(1)),$(if $(wildcard stack/$(1).yml),$(dir $(1)),$(1))),$(dir $(1)))),stack/$(name)))) - $(eval COMPOSE_FILE += $(wildcard $(foreach file,$(name) $(name).$(ENV) $(name).$(ENV).$(version) $(name).$(version),$(path)/$(file).yml))) + $(eval path := $(patsubst %/,%,$(or $(3),$(if $(findstring /,$(1)),$(if $(wildcard stack/$(1) stack/$(1).yml),stack/$(if $(findstring .yml,$(1)),$(dir $(1)),$(if $(wildcard stack/$(1).yml),$(dir $(1)),$(1))),$(if $(wildcard stack/$(stackz)/$(1) stack/$(stackz)/$(1).yml),stack/$(stackz)/$(if $(findstring .yml,$(1)),$(dir $(1)),$(if $(wildcard stack/$(stackz)/$(1).yml),$(dir $(1)),$(1))),$(dir $(1))))),$(firstword $(wildcard stack/$(stackz)/$(name) stack/$(stackz) stack/$(name)))))) + $(eval COMPOSE_FILE += $(wildcard $(foreach file,$(name) $(name).$(ENV) $(name).$(ENV).$(version) $(name).$(version) $(foreach env,$(COMPOSE_FILE_ENV),$(name).$(env)),$(path)/$(file).yml))) $(eval COMPOSE_FILE := $(strip $(COMPOSE_FILE))) $(if $(wildcard $(path)/.env.dist),$(call .env,,$(path)/.env.dist,$(wildcard $(CONFIG)/$(ENV)/$(APP)/.env $(path)/.env.$(ENV) .env))) endef diff --git a/make/def.app.mk b/make/def.app.mk index 2749f4f..f0065d8 100644 --- a/make/def.app.mk +++ b/make/def.app.mk @@ -16,7 +16,7 @@ define app-bootstrap $(eval APP := $(or $(1), $(APP))) $(eval APP_DIR := $(or $(2), $(RELATIVE)$(APP))) $(eval APP_NAME := $(or $(3),$(subst -,,$(subst .,,$(call LOWERCASE,$(APP)))))) - $(eval COMPOSE_FILE := $(wildcard $(APP_DIR)/docker-compose.yml $(APP_DIR)/docker-compose.$(ENV).yml $(APP_DIR)/docker/docker-compose.yml $(foreach file,$(patsubst $(APP_DIR)/docker/docker-compose.%,%,$(basename $(wildcard $(APP_DIR)/docker/docker-compose.*.yml))),$(if $(filter true,$(COMPOSE_FILE_$(file)) $(COMPOSE_FILE_$(call UPPERCASE,$(file)))),$(APP_DIR)/docker/docker-compose.$(file).yml)))) + $(eval COMPOSE_FILE := $(STACK_MYOS_FILE) $(wildcard $(APP_DIR)/docker-compose.yml $(APP_DIR)/docker-compose.$(ENV).yml $(APP_DIR)/docker/docker-compose.yml $(foreach file,$(patsubst $(APP_DIR)/docker/docker-compose.%,%,$(basename $(wildcard $(APP_DIR)/docker/docker-compose.*.yml))),$(if $(filter true,$(COMPOSE_FILE_$(file)) $(COMPOSE_FILE_$(call UPPERCASE,$(file)))),$(APP_DIR)/docker/docker-compose.$(file).yml)))) $(eval DOCKER_BUILD_DIR := $(APP_DIR)) $(if $(wildcard $(APP_DIR)/.env.dist), $(call .env,$(APP_DIR)/.env,$(APP_DIR)/.env.dist)) $(if $(wildcard $(APP_DIR)/.env.example), $(call .env,$(APP_DIR)/.env,$(APP_DIR)/.env.example)) @@ -33,6 +33,12 @@ define app-build ) endef +# function app-config: Call docker-compose config with each docker-compose.yml in dir 1 +define app-config + $(call INFO,app-config,$(1)$(comma)) + $(call docker-compose,config) +endef + # function app-connect: Call docker exec $(DOCKER_SHELL) for each Dockerfile in dir 1 define app-connect $(call INFO,app-connect,$(1)$(comma)) diff --git a/make/def.docker.mk b/make/def.docker.mk index d4ebeb1..1d51400 100644 --- a/make/def.docker.mk +++ b/make/def.docker.mk @@ -27,6 +27,8 @@ HOST_GID ?= 100 HOST_UID ?= 123 RESU_DOCKER_REPOSITORY ?= $(subst -,/,$(USER_COMPOSE_PROJECT_NAME)) STACK_HOST ?= $(filter host,$(firstword $(subst /, ,$(STACK)))) +STACK_MYOS ?= stack/myos +STACK_MYOS_FILE ?= $(STACK_MYOS)/networks.yml $(wildcard $(STACK_MYOS)/*.$(ENV).yml) STACK_USER ?= $(filter User,$(firstword $(subst /, ,$(STACK)))) USER_COMPOSE_PROJECT_NAME ?= $(subst .,-,$(RESU)) USER_COMPOSE_SERVICE_NAME ?= $(USER_COMPOSE_PROJECT_NAME) diff --git a/stack/User/User.yml b/stack/User/User.yml index 761281a..bdc18ee 100644 --- a/stack/User/User.yml +++ b/stack/User/User.yml @@ -49,8 +49,3 @@ volumes: user: external: true name: ${USER_DOCKER_VOLUME} - -networks: - private: - external: true - name: ${DOCKER_NETWORK} diff --git a/stack/User/ipfs.yml b/stack/User/ipfs.yml index fbe26f6..4700ec5 100644 --- a/stack/User/ipfs.yml +++ b/stack/User/ipfs.yml @@ -94,11 +94,3 @@ volumes: home: external: true name: ${HOST_DOCKER_VOLUME}_home - -networks: - private: - external: true - name: ${DOCKER_NETWORK} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/cloud/nextcloud.yml b/stack/cloud/nextcloud.yml index 284f1df..03b0119 100644 --- a/stack/cloud/nextcloud.yml +++ b/stack/cloud/nextcloud.yml @@ -23,11 +23,3 @@ services: volumes: nextcloud: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/drone/drone-runner-docker.yml b/stack/drone/drone-runner-docker.yml index 6ce9c09..145bd99 100644 --- a/stack/drone/drone-runner-docker.yml +++ b/stack/drone/drone-runner-docker.yml @@ -17,8 +17,3 @@ services: restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/drone/drone.yml b/stack/drone/drone.yml index 6a57f73..d976c9e 100644 --- a/stack/drone/drone.yml +++ b/stack/drone/drone.yml @@ -33,11 +33,3 @@ services: volumes: drone: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/drone/gc.yml b/stack/drone/gc.yml index 57e2831..4fa4bd6 100644 --- a/stack/drone/gc.yml +++ b/stack/drone/gc.yml @@ -11,8 +11,3 @@ services: restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/elastic/apm-server-oss.yml b/stack/elastic/apm-server-oss.yml index 1e1aa01..13dd55c 100644 --- a/stack/elastic/apm-server-oss.yml +++ b/stack/elastic/apm-server-oss.yml @@ -19,11 +19,3 @@ services: ports: - 8200 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/elastic/apm-server.yml b/stack/elastic/apm-server.yml index 5417269..935a8e0 100644 --- a/stack/elastic/apm-server.yml +++ b/stack/elastic/apm-server.yml @@ -16,11 +16,3 @@ services: ports: - 8200 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/elastic/curator.yml b/stack/elastic/curator.yml index 1844f24..5f80706 100644 --- a/stack/elastic/curator.yml +++ b/stack/elastic/curator.yml @@ -19,8 +19,3 @@ services: networks: - private restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/elastic/elasticsearch.local.7.4.yml b/stack/elastic/elasticsearch.local.7.4.yml index 77f3c6b..b582743 100644 --- a/stack/elastic/elasticsearch.local.7.4.yml +++ b/stack/elastic/elasticsearch.local.7.4.yml @@ -4,4 +4,3 @@ services: elasticsearch: environment: - discovery.type=single-node - diff --git a/stack/elastic/elasticsearch.yml b/stack/elastic/elasticsearch.yml index 1cd647b..bcdebd3 100644 --- a/stack/elastic/elasticsearch.yml +++ b/stack/elastic/elasticsearch.yml @@ -38,11 +38,3 @@ services: volumes: elasticsearch: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/elastic/kibana-oss.yml b/stack/elastic/kibana-oss.yml index ac9bbee..8f76caf 100644 --- a/stack/elastic/kibana-oss.yml +++ b/stack/elastic/kibana-oss.yml @@ -12,11 +12,3 @@ services: ports: - 5601 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/elastic/kibana.yml b/stack/elastic/kibana.yml index a2ec2f9..d8ed89a 100644 --- a/stack/elastic/kibana.yml +++ b/stack/elastic/kibana.yml @@ -12,11 +12,3 @@ services: ports: - 5601 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/grafana/grafana.yml b/stack/grafana/grafana.yml index d19e2b5..396e7e7 100644 --- a/stack/grafana/grafana.yml +++ b/stack/grafana/grafana.yml @@ -30,11 +30,3 @@ services: volumes: grafana: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/acme.mk b/stack/host/acme.mk index f68e0f8..a1e60c4 100644 --- a/stack/host/acme.mk +++ b/stack/host/acme.mk @@ -1,3 +1,5 @@ ENV_VARS += HOST_ACME_POST_HOOK HOST_ACME_PRE_HOOK HOST_ACME_DOMAIN_PATH_VALID ?= $$(echo $${DOMAIN_PATH:-} |awk "'"/^[0-9a-z_\-\.+\/]+@[0-9a-z_\-\.]+\.[a-z0-9_\-\.\+\/]+$$/"'") -HOST_ACME_POST_HOOK ?= [ "$(HOST_ACME_DOMAIN_PATH_VALID)" ] && cp fullchain.cer /host/certs/$${domain}-cert.pem 2>/dev/null && cp $${domain}.key /host/certs/$${domain}-key.pem +HOST_ACME_DOMAIN_CERT_MODULUS ?= $$(openssl x509 -in fullchain.cer -noout -modulus) +HOST_ACME_DOMAIN_KEY_MODULUS ?= $$(openssl rsa -in $${domain}.key -noout -modulus) +HOST_ACME_POST_HOOK ?= [ "$(HOST_ACME_DOMAIN_PATH_VALID)" ] && cp -a fullchain.cer /host/certs/$${domain}-cert.pem 2>/dev/null && [ "$(HOST_ACME_DOMAIN_CERT_MODULUS)" = "$(HOST_ACME_DOMAIN_KEY_MODULUS)" ] && cp -a $${domain}.key /host/certs/$${domain}-key.pem diff --git a/stack/host/acme.yml b/stack/host/acme.yml index c945b70..5707ab1 100644 --- a/stack/host/acme.yml +++ b/stack/host/acme.yml @@ -31,8 +31,3 @@ volumes: host: external: true name: ${HOST_DOCKER_VOLUME} - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/apache/php5.www.yml b/stack/host/apache/php5.www.yml index 4f4d50b..5addd30 100644 --- a/stack/host/apache/php5.www.yml +++ b/stack/host/apache/php5.www.yml @@ -9,4 +9,3 @@ services: volumes: www: - diff --git a/stack/host/apache/php5.yml b/stack/host/apache/php5.yml index a4ccd89..bd54129 100644 --- a/stack/host/apache/php5.yml +++ b/stack/host/apache/php5.yml @@ -29,8 +29,3 @@ services: volumes: backup: web: - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC:-localhost} diff --git a/stack/host/backup/restic.yml b/stack/host/backup/restic.yml index b691dec..acb3f7c 100644 --- a/stack/host/backup/restic.yml +++ b/stack/host/backup/restic.yml @@ -18,4 +18,3 @@ services: volumes: restic: - diff --git a/stack/host/exporter/cadvisor.yml b/stack/host/exporter/cadvisor.yml index caaf6de..138664f 100644 --- a/stack/host/exporter/cadvisor.yml +++ b/stack/host/exporter/cadvisor.yml @@ -20,8 +20,3 @@ services: - /sys:/sys:ro - /var/lib/docker/:/var/lib/docker:ro - /var/run:/var/run:rw - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/exporter/node.yml b/stack/host/exporter/node.yml index 091b3d7..1685835 100644 --- a/stack/host/exporter/node.yml +++ b/stack/host/exporter/node.yml @@ -23,8 +23,3 @@ services: - /:/rootfs:ro - /proc:/host/proc:ro - /sys:/host/sys:ro - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/ftps.mk b/stack/host/ftps.mk new file mode 100644 index 0000000..acb5249 --- /dev/null +++ b/stack/host/ftps.mk @@ -0,0 +1 @@ +HOST_FTPS_UFW_DOCKER ?= 21/tcp 18700/tcp 18701/tcp 18702/tcp 18703/tcp 18704/tcp 18705/tcp 18706/tcp 18707/tcp 18708/tcp 18709/tcp 18710/tcp diff --git a/stack/host/ftps.yml b/stack/host/ftps.yml new file mode 100644 index 0000000..a86ea3e --- /dev/null +++ b/stack/host/ftps.yml @@ -0,0 +1,32 @@ +version: '3.6' + +services: + ftps: + container_name: ${HOST_COMPOSE_PROJECT_NAME}-ftps + environment: + - FTPS_EXTERNAL_IP=${DOCKER_HOST_INET4} + - FTPS_PASS=${HOST_FTPS_PASS} + - FTPS_USER=${HOST_FTPS_USER} + - FTPS_UID=${HOST_FTPS_UID} + image: bfren/ftps:latest + labels: + - SERVICE_21_CHECK_TCP=true + - SERVICE_21_NAME=${COMPOSE_SERVICE_NAME}-ftps-21 + networks: + - private + - public + ports: + - 21:21 + - 18700-18710:18700-18710 + restart: always + volumes: + - backup:/files + - host:/host + - ssl:/ssl + +volumes: + backup: + host: + external: true + name: ${HOST_DOCKER_VOLUME} + ssl: diff --git a/stack/host/ipfs.home.yml b/stack/host/ipfs.home.yml index 142a993..7642bf4 100644 --- a/stack/host/ipfs.home.yml +++ b/stack/host/ipfs.home.yml @@ -7,4 +7,3 @@ services: volumes: home: - diff --git a/stack/host/ipfs.yml b/stack/host/ipfs.yml index dc27012..fd969aa 100644 --- a/stack/host/ipfs.yml +++ b/stack/host/ipfs.yml @@ -86,4 +86,3 @@ services: volumes: ipfs: - diff --git a/stack/host/mail.mk b/stack/host/mail.mk index 6b05836..3236003 100644 --- a/stack/host/mail.mk +++ b/stack/host/mail.mk @@ -1,6 +1,7 @@ # ENV_VARS += HOST_MAILSERVER_ENABLE_MANAGESIEVE HOST_MAILSERVER_SPOOF_PROTECTION HOST_MAILSERVER_SSL_TYPE HOST_MAILSERVER_ENABLE_UPDATE_CHECK +HOST_MAILSERVER_ENABLE_FAIL2BAN ?= 1 HOST_MAILSERVER_ENABLE_MANAGESIEVE ?= 1 +HOST_MAILSERVER_ENABLE_UPDATE_CHECK ?= 0 HOST_MAILSERVER_SPOOF_PROTECTION ?= 1 HOST_MAILSERVER_SSL_TYPE ?= letsencrypt -HOST_MAILSERVER_ENABLE_UPDATE_CHECK ?= 0 HOST_MAILSERVER_UFW_DOCKER ?= 25/tcp 465/tcp 587/tcp 993/tcp diff --git a/stack/host/mail/mailserver.yml b/stack/host/mail/mailserver.yml index 435caf9..50f38c4 100644 --- a/stack/host/mail/mailserver.yml +++ b/stack/host/mail/mailserver.yml @@ -28,7 +28,7 @@ services: - ENABLE_AMAVIS=${HOST_MAILSERVER_ENABLE_AMAVIS:-1} - AMAVIS_LOGLEVEL=${HOST_MAILSERVER_AMAVIS_LOGLEVEL:-0} - ENABLE_DNSBL=${HOST_MAILSERVER_ENABLE_DNSBL:-0} - - ENABLE_FAIL2BAN=${HOST_MAILSERVER_ENABLE_FAIL2BAN:-0} + - ENABLE_FAIL2BAN=${HOST_MAILSERVER_ENABLE_FAIL2BAN:-1} - FAIL2BAN_BLOCKTYPE=${HOST_MAILSERVER_FAIL2BAN_BLOCKTYPE:-drop} - ENABLE_MANAGESIEVE=${HOST_MAILSERVER_ENABLE_MANAGESIEVE:-1} - POSTSCREEN_ACTION=${HOST_MAILSERVER_POSTSCREEN_ACTION:-enforce} @@ -155,8 +155,3 @@ volumes: host: external: true name: ${HOST_DOCKER_VOLUME} - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/nginx.dns.yml b/stack/host/nginx.dns.yml index 625c746..25713db 100644 --- a/stack/host/nginx.dns.yml +++ b/stack/host/nginx.dns.yml @@ -9,4 +9,3 @@ services: volumes: dns: - diff --git a/stack/host/nginx.www.yml b/stack/host/nginx.www.yml index 16c0639..8ce170c 100644 --- a/stack/host/nginx.www.yml +++ b/stack/host/nginx.www.yml @@ -7,4 +7,3 @@ services: volumes: www: - diff --git a/stack/host/nginx.yml b/stack/host/nginx.yml index 9bdc407..0ebe171 100644 --- a/stack/host/nginx.yml +++ b/stack/host/nginx.yml @@ -51,8 +51,3 @@ volumes: htpasswd: log: vhost: - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/php.dns.yml b/stack/host/php.dns.yml index 954878e..eb55cc6 100644 --- a/stack/host/php.dns.yml +++ b/stack/host/php.dns.yml @@ -7,4 +7,3 @@ services: volumes: dns: - diff --git a/stack/host/php.www.yml b/stack/host/php.www.yml index b41c618..52b3d1c 100644 --- a/stack/host/php.www.yml +++ b/stack/host/php.www.yml @@ -7,4 +7,3 @@ services: volumes: www: - diff --git a/stack/host/php.yml b/stack/host/php.yml index 1e24b1d..a811ed9 100644 --- a/stack/host/php.yml +++ b/stack/host/php.yml @@ -14,8 +14,3 @@ services: networks: - public restart: always - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/portainer.yml b/stack/host/portainer.yml index 0cd7f53..fbe242a 100644 --- a/stack/host/portainer.yml +++ b/stack/host/portainer.yml @@ -21,8 +21,3 @@ services: volumes: portainer: - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/static.yml b/stack/host/static.yml index e55bfc9..d760c94 100644 --- a/stack/host/static.yml +++ b/stack/host/static.yml @@ -18,8 +18,3 @@ services: volumes: static: - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/host/vdi/vdi.yml b/stack/host/vdi/vdi.yml index 026460e..59b00c6 100644 --- a/stack/host/vdi/vdi.yml +++ b/stack/host/vdi/vdi.yml @@ -40,11 +40,6 @@ services: - shared:/shared:cached - shm:/dev/shm:delegated -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} - volumes: home: shared: diff --git a/stack/host/volumes.dns.local.yml b/stack/host/volumes.dns.local.yml deleted file mode 100644 index acb34a8..0000000 --- a/stack/host/volumes.dns.local.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.6' - -volumes: - dns: - driver: local - driver_opts: - device: /dns - o: bind - type: none diff --git a/stack/host/volumes.home.local.yml b/stack/host/volumes.home.local.yml deleted file mode 100644 index a9149b7..0000000 --- a/stack/host/volumes.home.local.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '3.6' - -volumes: - home: - driver: local - driver_opts: - device: /home - o: bind - type: none - diff --git a/stack/host/volumes.log.local.yml b/stack/host/volumes.log.local.yml deleted file mode 100644 index 01c9452..0000000 --- a/stack/host/volumes.log.local.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.6' - -volumes: - log: - driver: local - driver_opts: - device: /var/log - o: bind - type: none diff --git a/stack/host/volumes.www.local.yml b/stack/host/volumes.www.local.yml deleted file mode 100644 index 28340d3..0000000 --- a/stack/host/volumes.www.local.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.6' - -volumes: - www: - driver: local - driver_opts: - device: /var/www - o: bind - type: none diff --git a/stack/ipfs/ipfs.yml b/stack/ipfs/ipfs.yml index 6df386d..8452fbb 100644 --- a/stack/ipfs/ipfs.yml +++ b/stack/ipfs/ipfs.yml @@ -92,11 +92,3 @@ volumes: type: none device: ${HOME}/.ipfs o: bind - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/memcached/memcached.yml b/stack/memcached/memcached.yml index 850e4dc..2af79f1 100644 --- a/stack/memcached/memcached.yml +++ b/stack/memcached/memcached.yml @@ -11,8 +11,3 @@ services: ports: - 11211 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/mysql/mysql.yml b/stack/mysql/mysql.yml index baaee05..4237bf6 100644 --- a/stack/mysql/mysql.yml +++ b/stack/mysql/mysql.yml @@ -17,8 +17,3 @@ services: volumes: mysql: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/newrelic/php-daemon.yml b/stack/newrelic/php-daemon.yml index e1ffef3..60b67a9 100644 --- a/stack/newrelic/php-daemon.yml +++ b/stack/newrelic/php-daemon.yml @@ -12,8 +12,3 @@ services: ports: - 31339 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/nginx/nginx.yml b/stack/nginx/nginx.yml index 01a4e49..79ae2eb 100644 --- a/stack/nginx/nginx.yml +++ b/stack/nginx/nginx.yml @@ -45,11 +45,3 @@ volumes: type: none device: ${MONOREPO_DIR} o: bind - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE:-docker} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC:-localhost} diff --git a/stack/nginx/static.yml b/stack/nginx/static.yml index a1c88b8..f0d2462 100644 --- a/stack/nginx/static.yml +++ b/stack/nginx/static.yml @@ -19,11 +19,3 @@ services: volumes: static: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE:-docker} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC:-static.localhost} diff --git a/stack/portainer/portainer.yml b/stack/portainer/portainer.yml index 231ff74..64ab44a 100644 --- a/stack/portainer/portainer.yml +++ b/stack/portainer/portainer.yml @@ -20,8 +20,3 @@ services: volumes: portainer: - -networks: - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/postgres/postgres.yml b/stack/postgres/postgres.yml index e0a5348..1980588 100644 --- a/stack/postgres/postgres.yml +++ b/stack/postgres/postgres.yml @@ -20,8 +20,3 @@ services: volumes: postgres: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/prometheus/alertmanager.yml b/stack/prometheus/alertmanager.yml index 864051f..94ed49e 100644 --- a/stack/prometheus/alertmanager.yml +++ b/stack/prometheus/alertmanager.yml @@ -19,11 +19,3 @@ services: ports: - 9093 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/prometheus/blackbox.yml b/stack/prometheus/blackbox.yml index 80a8529..7263f5d 100644 --- a/stack/prometheus/blackbox.yml +++ b/stack/prometheus/blackbox.yml @@ -18,11 +18,3 @@ services: ports: - 9115 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/prometheus/es-exporter.yml b/stack/prometheus/es-exporter.yml index e6fac31..bc63a58 100644 --- a/stack/prometheus/es-exporter.yml +++ b/stack/prometheus/es-exporter.yml @@ -19,11 +19,3 @@ services: ports: - 9206 restart: always - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/prometheus/prometheus.yml b/stack/prometheus/prometheus.yml index 24a80bf..7fed3e7 100644 --- a/stack/prometheus/prometheus.yml +++ b/stack/prometheus/prometheus.yml @@ -25,11 +25,3 @@ services: volumes: prometheus: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/rabbitmq/rabbitmq.yml b/stack/rabbitmq/rabbitmq.yml index 4562a53..b1e0e6e 100644 --- a/stack/rabbitmq/rabbitmq.yml +++ b/stack/rabbitmq/rabbitmq.yml @@ -25,11 +25,3 @@ services: volumes: rabbitmq: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/redis/redis.yml b/stack/redis/redis.yml index c84c567..44c8900 100644 --- a/stack/redis/redis.yml +++ b/stack/redis/redis.yml @@ -17,11 +17,3 @@ services: volumes: redis: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/redmine/redmine.yml b/stack/redmine/redmine.yml index 4768eeb..50b45dd 100644 --- a/stack/redmine/redmine.yml +++ b/stack/redmine/redmine.yml @@ -37,11 +37,3 @@ services: volumes: redmine: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/redmine/redmine3.yml b/stack/redmine/redmine3.yml index c03a5c0..03f7fd6 100644 --- a/stack/redmine/redmine3.yml +++ b/stack/redmine/redmine3.yml @@ -30,11 +30,3 @@ services: volumes: redmine3: - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/sematext/logagent.yml b/stack/sematext/logagent.yml index 34fec26..82424b8 100644 --- a/stack/sematext/logagent.yml +++ b/stack/sematext/logagent.yml @@ -21,8 +21,3 @@ services: restart: always volumes: - /var/run/docker.sock:/tmp/docker.sock - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} diff --git a/stack/theia/theia.yml b/stack/theia/theia.yml index 6453683..5de9061 100644 --- a/stack/theia/theia.yml +++ b/stack/theia/theia.yml @@ -46,11 +46,3 @@ volumes: user: external: true name: ${USER_DOCKER_VOLUME} - -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} diff --git a/stack/x2go/vdi.yml b/stack/x2go/vdi.yml index 6f36872..bf74e4e 100644 --- a/stack/x2go/vdi.yml +++ b/stack/x2go/vdi.yml @@ -40,14 +40,6 @@ services: - vdi-shared:/shared:cached - vdi-shm:/dev/shm:delegated -networks: - private: - external: true - name: ${DOCKER_NETWORK_PRIVATE} - public: - external: true - name: ${DOCKER_NETWORK_PUBLIC} - volumes: vdi-home: vdi-shared: