From dff81eda19332776c8f58e3cde38e4865057a1b1 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 24 Nov 2019 12:51:07 +0100
Subject: [PATCH] [Helper] Move override examples to
 helper-scripts/docker-compose.override.yml.d

---
 docker-compose.yml                            | 13 ------
 .../EXTERNAL_DNS.docker-compose.override.yml  | 44 -------------------
 .../ext_sql_sock.docker-compose.override.yml  | 31 -------------
 3 files changed, 88 deletions(-)
 delete mode 100644 helper-scripts/EXTERNAL_DNS.docker-compose.override.yml
 delete mode 100644 helper-scripts/ext_sql_sock.docker-compose.override.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 9c529241..e90dd319 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,6 @@ services:
 
     unbound-mailcow:
       image: mailcow/unbound:1.9
-      build: ./data/Dockerfiles/unbound
       environment:
         - TZ=${TZ}
       volumes:
@@ -54,7 +53,6 @@ services:
 
     clamd-mailcow:
       image: mailcow/clamd:1.33
-      build: ./data/Dockerfiles/clamd
       restart: always
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -70,7 +68,6 @@ services:
 
     rspamd-mailcow:
       image: mailcow/rspamd:1.56
-      build: ./data/Dockerfiles/rspamd
       stop_grace_period: 30s
       depends_on:
         - nginx-mailcow
@@ -98,7 +95,6 @@ services:
 
     php-fpm-mailcow:
       image: mailcow/phpfpm:1.54
-      build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
         - redis-mailcow
@@ -147,7 +143,6 @@ services:
 
     sogo-mailcow:
       image: mailcow/sogo:1.63
-      build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}
@@ -176,7 +171,6 @@ services:
 
     dovecot-mailcow:
       image: mailcow/dovecot:1.97
-      build: ./data/Dockerfiles/dovecot
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       cap_add:
@@ -230,7 +224,6 @@ services:
 
     postfix-mailcow:
       image: mailcow/postfix:1.42
-      build: ./data/Dockerfiles/postfix
       volumes:
         - ./data/conf/postfix:/opt/postfix/conf
         - ./data/assets/ssl:/etc/ssl/mail/:ro
@@ -317,7 +310,6 @@ services:
       depends_on:
         - nginx-mailcow
       image: mailcow/acme:1.63
-      build: ./data/Dockerfiles/acme
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       environment:
@@ -347,7 +339,6 @@ services:
 
     netfilter-mailcow:
       image: mailcow/netfilter:1.31
-      build: ./data/Dockerfiles/netfilter
       stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow
@@ -371,7 +362,6 @@ services:
       image: mailcow/watchdog:1.62
       # Debug
       #command: /watchdog.sh
-      build: ./data/Dockerfiles/watchdog
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       volumes:
@@ -403,7 +393,6 @@ services:
     dockerapi-mailcow:
       image: mailcow/dockerapi:1.36
       restart: always
-      build: ./data/Dockerfiles/dockerapi
       oom_kill_disable: true
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -419,7 +408,6 @@ services:
 
     solr-mailcow:
       image: mailcow/solr:1.7
-      build: ./data/Dockerfiles/solr
       restart: always
       volumes:
         - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data
@@ -437,7 +425,6 @@ services:
     olefy-mailcow:
       image: mailcow/olefy:1.2
       restart: always
-      build: ./data/Dockerfiles/olefy
       environment:
         - TZ=${TZ}
         - OLEFY_BINDADDRESS=0.0.0.0
diff --git a/helper-scripts/EXTERNAL_DNS.docker-compose.override.yml b/helper-scripts/EXTERNAL_DNS.docker-compose.override.yml
deleted file mode 100644
index 74763bf2..00000000
--- a/helper-scripts/EXTERNAL_DNS.docker-compose.override.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: '2.1'
-services:
-
-    clamd-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    rspamd-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    php-fpm-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    sogo-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    dovecot-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    postfix-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    nginx-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    acme-mailcow:
-      dns:
-        - my.resolvers.ip.addr
-
-    watchdog-mailcow:
-      environment:
-        - CHECK_UNBOUND=0
-      dns:
-        - my.resolvers.ip.addr
-
-    dockerapi-mailcow:
-      dns:
-        - my.resolvers.ip.addr
diff --git a/helper-scripts/ext_sql_sock.docker-compose.override.yml b/helper-scripts/ext_sql_sock.docker-compose.override.yml
deleted file mode 100644
index 1f052f08..00000000
--- a/helper-scripts/ext_sql_sock.docker-compose.override.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: '2.1'
-services:
-
-    php-fpm-mailcow:
-      volumes:
-        - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
-
-    sogo-mailcow:
-      volumes:
-        - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
-
-    dovecot-mailcow:
-      volumes:
-        - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
-
-    postfix-mailcow:
-      volumes:
-        - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
-
-    acme-mailcow:
-      volumes:
-        - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
-
-    watchdog-mailcow:
-      volumes:
-        - /var/run/mysqld/mysqld.sock:/var/run/mysqld/mysqld.sock
-
-    mysql-mailcow:
-      image: alpine:3.8
-      command: /bin/true
-      restart: "no"