Re-organize Docker Compose keys

Author: cytopia

docker-compose.yml

@@ -35,6 +35,7 @@ services:
   # ------------------------------------------------------------
   bind:
     image: cytopia/bind:0.15
+    hostname: bind
     restart: always
     ports:
       # [local-machine:]local-port:docker-port
@@ -85,17 +86,17 @@ services:
       docker.for.lin.host.internal: 172.16.238.1
       docker.for.lin.localhost: 172.16.238.1
 
-    hostname: bind
     networks:
       app_net:
         ipv4_address: 172.16.238.100
 
 
   # ------------------------------------------------------------
-  # PHP / HHVM
+  # PHP
   # ------------------------------------------------------------
   php:
     image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work-0.39
+    hostname: php
 
     ##
     ## All .env variables
@@ -156,7 +157,6 @@ services:
       docker.for.lin.host.internal: 172.16.238.1
       docker.for.lin.localhost: 172.16.238.1
 
-    hostname: php
     networks:
       app_net:
         ipv4_address: 172.16.238.10
@@ -207,6 +207,7 @@ services:
   # ------------------------------------------------------------
   httpd:
     image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.22
+    hostname: httpd
 
     environment:
 
@@ -263,7 +264,6 @@ services:
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_HTTPD}:80"
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_HTTPD_SSL}:443"
 
-    hostname: httpd
     networks:
       app_net:
         ipv4_address: 172.16.238.11
@@ -300,6 +300,7 @@ services:
   # ------------------------------------------------------------
   mysql:
     image: cytopia/${MYSQL_SERVER:-mariadb-10.1}:latest
+    hostname: mysql
 
     environment:
 
@@ -332,7 +333,6 @@ services:
       # [local-machine:]local-port:docker-port
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_MYSQL}:3306"
 
-    hostname: mysql
     networks:
       app_net:
         ipv4_address: 172.16.238.12
@@ -365,6 +365,7 @@ services:
   # ------------------------------------------------------------
   pgsql:
     image: postgres:${PGSQL_SERVER:-9.6}
+    hostname: pgsql
 
     environment:
 
@@ -376,7 +377,6 @@ services:
       # [local-machine:]local-port:docker-port
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_PGSQL}:5432"
 
-    hostname: pgsql
     networks:
       app_net:
         ipv4_address: 172.16.238.13
@@ -402,6 +402,7 @@ services:
   # ------------------------------------------------------------
   redis:
     image: redis:${REDIS_SERVER:-3.2}
+    hostname: redis
 
     # Apply custom arguments to redis startup
     command: redis-server ${REDIS_ARGS:- }
@@ -412,7 +413,6 @@ services:
       # [local-machine:]local-port:docker-port
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_REDIS}:6379"
 
-    hostname: redis
     networks:
       app_net:
         ipv4_address: 172.16.238.14
@@ -435,12 +435,12 @@ services:
   # ------------------------------------------------------------
   memcd:
     image: memcached:${MEMCD_SERVER:-latest}
+    hostname: memcd
 
     ports:
       # [local-machine:]local-port:docker-port
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_MEMCD}:11211"
 
-    hostname: memcd
     networks:
       app_net:
         ipv4_address: 172.16.238.15
@@ -463,12 +463,12 @@ services:
   # ------------------------------------------------------------
   mongo:
     image: mongo:${MONGO_SERVER:-latest}
+    hostname: mongo
 
     ports:
       # [local-machine:]local-port:docker-port
       - "${LOCAL_LISTEN_ADDR}${HOST_PORT_MONGO}:27017"
 
-    hostname: mongo
     networks:
       app_net:
         ipv4_address: 172.16.238.16