From 8ca2ee65df1119699cfd1c99b5026d19dca589b2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 23 Feb 2023 17:25:03 +0100
Subject: [PATCH] define container names explicitly

---
 deployment/docker-compose.yml | 8 +++++++-
 docker-compose.override.yml   | 1 +
 docker-compose.yml            | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index d2bb377a3..6239be6c7 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -17,6 +17,7 @@ services:
 
   webapp:
     image: ocelotsocialnetwork/webapp-branded:local-${CONFIGURATION}
+    container_name: webapp
     build:
       dockerfile: src/docker/webapp.Dockerfile
       target: branded
@@ -60,6 +61,7 @@ services:
   
   backend:
     image: ocelotsocialnetwork/backend-branded:local-${CONFIGURATION}
+    container_name: backend
     build:
       dockerfile: src/docker/backend.Dockerfile
       target: branded
@@ -87,7 +89,6 @@ services:
       - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
       - EMAIL_SUPPORT=support@wir.social
       - EMAIL_DEFAULT_SENDER=info@wir.social
-      # - PRODUCTION_DB_CLEAN_ALLOW=false # only true for production environments on staging servers
       - PUBLIC_REGISTRATION=true
       - INVITE_REGISTRATION=true
       - CATEGORIES_ACTIVE=true
@@ -96,6 +97,8 @@ services:
       - SMTP_HOST=mailserver
       - SMTP_PORT=25
       - SMTP_IGNORE_TLS=true
+      #- PRODUCTION_DB_CLEAN_ALLOW=true
+      - NODE_ENV=development
 
   maintenance-base:
     image: ocelotsocialnetwork/maintenance:local-base
@@ -114,6 +117,7 @@ services:
   maintenance:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
     image: ocelotsocialnetwork/maintenance-branded:local-${CONFIGURATION}
+    container_name: maintenance
     build:
       # TODO: Separate from webapp, this must be independent
       dockerfile: src/docker/maintenance.Dockerfile
@@ -133,6 +137,7 @@ services:
 
   neo4j:
     image: ocelotsocialnetwork/neo4j-community:latest
+    container_name: neo4j
     networks:
       - test-network
     volumes:
@@ -146,6 +151,7 @@ services:
 
   mailserver:
     image: djfarrelly/maildev
+    container_name: mailserver
     ports:
       - 1080:80
     networks:
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index d8a3edc06..52bf57896 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -64,6 +64,7 @@ services:
   ########################################################
   mailserver:
     image: djfarrelly/maildev
+    container_name: mailserver
     ports:
       - 1080:80
     networks:
diff --git a/docker-compose.yml b/docker-compose.yml
index 154a8fd4c..aeb26e4fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
   webapp:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
     image: ocelotsocialnetwork/webapp:local-production
+    container_name: webapp
     build:
       context: ./webapp
       target: production
@@ -44,6 +45,7 @@ services:
   backend:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
     image: ocelotsocialnetwork/backend:local-production
+    container_name: backend
     build:
       context: ./backend
       target: production
@@ -78,6 +80,7 @@ services:
   maintenance:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
     image: ocelotsocialnetwork/maintenance:local-production
+    container_name: maintenance
     build:
       # TODO: Separate from webapp, this must be independent
       context: ./webapp
@@ -93,6 +96,7 @@ services:
   neo4j:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
     image: ocelotsocialnetwork/neo4j-community:local-production
+    container_name: neo4j
     build:
       context: ./neo4j
       # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment