From 676360dbb465d7c71d6c24a164c166dceca3da37 Mon Sep 17 00:00:00 2001
From: mithomas <dev@michael-thomas.net>
Date: Fri, 22 Mar 2019 14:04:42 +0100
Subject: [PATCH] Prefix container names with COMPOSE_PROJECT_NAME. (#118)

* Prefix container names with COMPOSE_PROJECT_NAME.

This way it is easily possible to use several instances of this service stack on one host via different .env-files (e.g. for staging/production).
Volumes and networks are separated in this manner by docker-compose anyway, now the containers are too.

* Use underscore in container-names for consistency with networks and volumes.

* Remove "kopano" from container names.

This avoids repetition in the names when using the default project name which also "kopano".

* Make Caddy default port configurable.
---
 docker-compose.yml | 48 +++++++++++++++++++++++-----------------------
 setup.sh           |  1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a097444..723ba07 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,10 @@ version: "3.5"
 services:
   web:
     image: ${docker_repo:-zokradonh}/kopano_web
-    container_name: web
+    container_name: ${COMPOSE_PROJECT_NAME}_web
     restart: unless-stopped
     ports:
-      - "2015:2015"
+      - "${CADDY:-2015}:2015"
       - "${HTTP:-80}:80"
       - "${HTTPS:-443}:443"
     environment:
@@ -29,7 +29,7 @@ services:
 
   ldap:
     image: ${docker_repo:-zokradonh}/kopano_ldap_demo
-    container_name: ldap
+    container_name: ${COMPOSE_PROJECT_NAME}_ldap
     ports:
       - ${LDAPPORT:-389}:389
     environment:
@@ -50,7 +50,7 @@ services:
 
   ldap-admin:
     image: osixia/phpldapadmin:0.7.2
-    container_name: ldap-admin
+    container_name: ${COMPOSE_PROJECT_NAME}_ldap-admin
     depends_on:
       - ldap
     environment:
@@ -63,7 +63,7 @@ services:
 
   password-self-service:
     image: tiredofit/self-service-password:3.0
-    container_name: password-self-service
+    container_name: ${COMPOSE_PROJECT_NAME}_password-self-service
     domainname: ${LDAP_DOMAIN}
     depends_on:
       - ldap
@@ -105,7 +105,7 @@ services:
     restart: unless-stopped
     hostname: mail
     domainname: ${LDAP_DOMAIN}
-    container_name: mail
+    container_name: ${COMPOSE_PROJECT_NAME}_mail
     depends_on:
       - ldap
     ports:
@@ -162,7 +162,7 @@ services:
   db:
     image: mariadb:10.3.10-bionic
     restart: unless-stopped
-    container_name: kopano_db
+    container_name: ${COMPOSE_PROJECT_NAME}_db
     volumes:
       - mysql/:/var/lib/mysql
     environment:
@@ -182,7 +182,7 @@ services:
   
   kopano_ssl:
     image: ${docker_repo:-zokradonh}/kopano_ssl
-    container_name: kopano_ssl
+    container_name: ${COMPOSE_PROJECT_NAME}_ssl
     environment:
       - FQDN=${FQDN}
       - PKI_COUNTRY=NL
@@ -194,7 +194,7 @@ services:
   kopano_server:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
     hostname: kopano_server
-    container_name: kopano_server
+    container_name: ${COMPOSE_PROJECT_NAME}_server
     depends_on:
       - db
       - ldap
@@ -244,7 +244,7 @@ services:
   kopano_webapp:
     image: ${docker_repo:-zokradonh}/kopano_webapp:${WEBAPP_VERSION:-latest}
     hostname: kopano_webapp
-    container_name: kopano_webapp
+    container_name: ${COMPOSE_PROJECT_NAME}_webapp
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -261,7 +261,7 @@ services:
   kopano_zpush:
     image: ${docker_repo:-zokradonh}/kopano_zpush:${ZPUSH_VERSION:-latest}
     hostname: kopano_zpush
-    container_name: kopano_zpush
+    container_name: ${COMPOSE_PROJECT_NAME}_zpush
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -276,7 +276,7 @@ services:
 
   kopano_grapi:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_grapi
+    container_name: ${COMPOSE_PROJECT_NAME}_grapi
     volumes:
       - kopanosocket/:/run/kopano
     environment:
@@ -289,7 +289,7 @@ services:
 
   kopano_kapi:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_kapi
+    container_name: ${COMPOSE_PROJECT_NAME}_kapi
     depends_on:
       - kopano_grapi
     volumes:
@@ -311,7 +311,7 @@ services:
   kopano_kdav:
     image: ${docker_repo:?err}/kopano_kdav:${KDAV_VERSION:-latest}
     hostname: kopano_kdav
-    container_name: kopano_kdav
+    container_name: ${COMPOSE_PROJECT_NAME}_kdav
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -324,7 +324,7 @@ services:
 
   kopano_dagent:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_dagent
+    container_name: ${COMPOSE_PROJECT_NAME}_dagent
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -340,7 +340,7 @@ services:
 
   kopano_spooler:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_spooler
+    container_name: ${COMPOSE_PROJECT_NAME}_spooler
     hostname: spooler
     domainname: ${LDAP_DOMAIN}
     volumes:
@@ -359,7 +359,7 @@ services:
 
   kopano_gateway:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_gateway
+    container_name: ${COMPOSE_PROJECT_NAME}_gateway
     ports:
       - "${IMAPPORT:-143}:143"
     volumes:
@@ -377,7 +377,7 @@ services:
 
   kopano_ical:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_ical
+    container_name: ${COMPOSE_PROJECT_NAME}_ical
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -393,7 +393,7 @@ services:
 
   kopano_monitor:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_monitor
+    container_name: ${COMPOSE_PROJECT_NAME}_monitor
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -407,7 +407,7 @@ services:
 
   kopano_search:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
-    container_name: kopano_search
+    container_name: ${COMPOSE_PROJECT_NAME}_search
     volumes:
       - kopanossl/:/kopano/ssl
       - kopanosocket/:/run/kopano
@@ -422,7 +422,7 @@ services:
 
   kopano_konnect:
     image: ${docker_repo:-zokradonh}/kopano_konnect:${KONNECT_VERSION:-latest}
-    container_name: kopano_konnect
+    container_name: ${COMPOSE_PROJECT_NAME}_konnect
     command: wrapper.sh
     volumes:
      - kopanossl/:/kopano/ssl
@@ -440,7 +440,7 @@ services:
 
   kopano_playground:
     image: ${docker_repo:-zokradonh}/kopano_playground
-    container_name: kopano_playground
+    container_name: ${COMPOSE_PROJECT_NAME}_playground
     depends_on:
      - kopano_kapi
      - kopano_konnect
@@ -450,7 +450,7 @@ services:
 
   kopano_kwmserver:
     image: ${docker_repo:-zokradonh}/kopano_kwmserver:${KWM_VERSION:-latest}
-    container_name: kopano_kwmserver
+    container_name: ${COMPOSE_PROJECT_NAME}_kwmserver
     command: wrapper.sh
     depends_on:
      - kopano_kapi
@@ -469,7 +469,7 @@ services:
 
   kopano_meet:
     image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest}
-    container_name: kopano_meet
+    container_name: ${COMPOSE_PROJECT_NAME}_meet
     environment:
      - SERVICE_TO_START=meet
      - KCCONF_KWEBD_TLS=no
diff --git a/setup.sh b/setup.sh
index 547b58a..3fd619a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -318,6 +318,7 @@ TZ=$TZ
 FQDN=$FQDN
 FQDNCLEANED=${FQDN%:*}
 EMAIL=$EMAIL
+CADDY=2015
 HTTP=80
 HTTPS=443
 LDAPPORT=389