Added WARDEN_ENV_NAME as prefix to each container hostname in compose…

… configs - issue #29
wardenenv · Oct 29, 2019 · 74c4702 · 74c4702
1 parent 551ede9
commit 74c4702
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/environments/magento1.base.yml b/environments/magento1.base.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 services:
   nginx:
-    hostname: nginx
+    hostname: "${WARDEN_ENV_NAME}-nginx"
     image: davidalger/warden:nginx-${NGINX_VERSION:-1.16}-alpine
     environment:
       - NGINX_TEMPLATE=magento1.conf
@@ -18,7 +18,7 @@ services:
       - default
 
   php-fpm:
-    hostname: php-fpm
+    hostname: "${WARDEN_ENV_NAME}-php-fpm"
     image: davidalger/warden:mage1-fpm-${PHP_VERSION:-7.2}
     environment:
       - NODE_VERSION=${NODE_VERSION:-10}
@@ -35,7 +35,7 @@ services:
       - warden
 
   php-debug:
-    hostname: php-debug
+    hostname: "${WARDEN_ENV_NAME}-php-debug"
     image: davidalger/warden:mage1-fpm-${PHP_VERSION:-7.2}-debug
     environment:
       - NODE_VERSION=${NODE_VERSION:-10}
@@ -53,7 +53,7 @@ services:
       - warden
 
   db:
-    hostname: mariadb
+    hostname: "${WARDEN_ENV_NAME}-mariadb"
     image: mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
@@ -70,11 +70,11 @@ services:
       - default
 
   redis:
-    hostname: redis
+    hostname: "${WARDEN_ENV_NAME}-redis"
     image: redis:${REDIS_VERSION:-5.0}-alpine
 
   mailhog:
-    hostname: mailhog
+    hostname: "${WARDEN_ENV_NAME}-mailhog"
     image: mailhog/mailhog:${MAILHOG_VERSION:-v1.0.0}
     labels:
       - traefik.enable=true

diff --git a/environments/magento1.blackfire.yml b/environments/magento1.blackfire.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 services:
   php-blackfire:
-    hostname: php-blackfire
+    hostname: "${WARDEN_ENV_NAME}-php-blackfire"
     image: davidalger/warden:mage1-fpm-${PHP_VERSION:-7.2}-blackfire
     depends_on:
       - db
@@ -14,7 +14,7 @@ services:
       - default
 
   blackfire-agent:
-    hostname: blackfire-agent
+    hostname: "${WARDEN_ENV_NAME}-blackfire-agent"
     image: blackfire/blackfire:latest
     environment:
       - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}

diff --git a/environments/magento2.base.yml b/environments/magento2.base.yml
@@ -1,15 +1,15 @@
 version: "3.5"
 services:
   nginx:
-    hostname: nginx
+    hostname: "${WARDEN_ENV_NAME}-nginx"
     image: davidalger/warden:nginx-${NGINX_VERSION:-1.16}-alpine
     environment:
       - NGINX_TEMPLATE=magento2.conf
     depends_on:
       - php-fpm
 
   varnish:
-    hostname: varnish
+    hostname: "${WARDEN_ENV_NAME}-varnish"
     image: davidalger/warden:varnish-${VARNISH_VERSION:-4.1}-alpine
     depends_on:
       - nginx
@@ -21,7 +21,7 @@ services:
       - default
 
   php-fpm:
-    hostname: php-fpm
+    hostname: "${WARDEN_ENV_NAME}-php-fpm"
     image: davidalger/warden:mage2-fpm-${PHP_VERSION:-7.2}
     environment:
       - NODE_VERSION=${NODE_VERSION:-10}
@@ -34,7 +34,7 @@ services:
       - warden
 
   php-debug:
-    hostname: php-debug
+    hostname: "${WARDEN_ENV_NAME}-php-debug"
     image: davidalger/warden:mage2-fpm-${PHP_VERSION:-7.2}-debug
     environment:
       - NODE_VERSION=${NODE_VERSION:-10}
@@ -48,7 +48,7 @@ services:
       - warden
 
   db:
-    hostname: mariadb
+    hostname: "${WARDEN_ENV_NAME}-mariadb"
     image: mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}
@@ -65,7 +65,7 @@ services:
       - default
 
   elasticsearch:
-    hostname: elasticsearch
+    hostname: "${WARDEN_ENV_NAME}-elasticsearch"
     image: davidalger/warden:elasticsearch-${ELASTICSEARCH_VERSION:-5.6}
     labels:
       - traefik.enable=true
@@ -82,11 +82,11 @@ services:
       - default
 
   redis:
-    hostname: redis
+    hostname: "${WARDEN_ENV_NAME}-redis"
     image: redis:${REDIS_VERSION:-5.0}-alpine
 
   rabbitmq:
-    hostname: rabbitmq
+    hostname: "${WARDEN_ENV_NAME}-rabbitmq"
     image: rabbitmq:${RABBITMQ_VERSION:-3.7.14}-management-alpine
     labels:
       - traefik.enable=true
@@ -97,7 +97,7 @@ services:
       - default
 
   mailhog:
-    hostname: mailhog
+    hostname: "${WARDEN_ENV_NAME}-mailhog"
     image: mailhog/mailhog:${MAILHOG_VERSION:-v1.0.0}
     labels:
       - traefik.enable=true

diff --git a/environments/magento2.blackfire.base.yml b/environments/magento2.blackfire.base.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 services:
   php-blackfire:
-    hostname: php-blackfire
+    hostname: "${WARDEN_ENV_NAME}-php-blackfire"
     image: davidalger/warden:mage2-fpm-${PHP_VERSION:-7.2}-blackfire
     depends_on:
       - db
@@ -10,7 +10,7 @@ services:
       - default
 
   blackfire-agent:
-    hostname: blackfire-agent
+    hostname: "${WARDEN_ENV_NAME}-blackfire-agent"
     image: blackfire/blackfire:latest
     environment:
       - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}

diff --git a/environments/magento2.splitdb.checkout.yml b/environments/magento2.splitdb.checkout.yml
@@ -9,7 +9,7 @@ services:
       - checkoutdb
 
   checkoutdb:
-    hostname: checkoutdb
+    hostname: "${WARDEN_ENV_NAME}-checkoutdb"
     image: mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}

diff --git a/environments/magento2.splitdb.sales.yml b/environments/magento2.splitdb.sales.yml
@@ -9,7 +9,7 @@ services:
       - salesdb
 
   salesdb:
-    hostname: salesdb
+    hostname: "${WARDEN_ENV_NAME}-salesdb"
     image: mariadb:${MARIADB_VERSION:-10.3}
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-magento}