Minor improvements

Author: Vishal Raj

docker/master-2-master.yml

@@ -2,6 +2,7 @@ version: "3"
 services:
     master_1:
         image: mysql:5.7.27
+        container_name: ${MASTER_1_HOSTNAME}
         hostname: ${MASTER_1_HOSTNAME}
         volumes:
             - ../conf/master1.cnf:/etc/mysql/conf.d/my.cnf:ro
@@ -14,6 +15,7 @@ services:
                 ipv4_address: ${MASTER_1_HOST_IP}
     master_2:
         image: mysql:5.7.27
+        container_name: ${MASTER_2_HOSTNAME}
         hostname: ${MASTER_2_HOSTNAME}
         volumes:
             - ../conf/master2.cnf:/etc/mysql/conf.d/my.cnf:ro

docker/master-2-slave.yml

@@ -2,6 +2,7 @@ version: "3"
 services:
     master_1:
         image: mysql:5.7.27
+        container_name: ${MASTER_1_HOSTNAME}
         hostname: ${MASTER_1_HOSTNAME}
         volumes:
             - ../conf/master1.cnf:/etc/mysql/conf.d/my.cnf:ro
@@ -14,6 +15,7 @@ services:
                 ipv4_address: ${MASTER_1_HOST_IP}
     slave_1:
         image: mysql:5.7.27
+        container_name: ${SLAVE_1_HOSTNAME}
         hostname: ${SLAVE_1_HOSTNAME}
         volumes:
             - ../conf/slave1.cnf:/etc/mysql/conf.d/my.cnf:ro
@@ -49,6 +51,16 @@ services:
             REPL_USER: ${REPL_USER}
             REPL_PASSWORD: ${REPL_PASSWORD}
         command: bash ${REPL_SCRIPT_MOUNT_PATH}/master-2-slave.sh
+    pma:
+        image: phpmyadmin:phpmyadmin
+        container_name: phpmyadmin
+        environment:
+            PMA_ARBITRARY=1
+        restart: always
+        ports:
+            - 8080:80
+        volumes:
+            - /sessions
 networks:
     replication_network:
         ipam:

docker/slave-2-master-2-master-2-slave.yml

@@ -2,6 +2,7 @@ version: "3"
 services:
     master_1:
         image: mysql:5.7.27
+        container_name: ${MASTER_1_HOSTNAME}
         hostname: ${MASTER_1_HOSTNAME}
         volumes:
             - ../conf/master1.cnf:/etc/mysql/conf.d/my.cnf:ro
@@ -14,6 +15,7 @@ services:
                 ipv4_address: ${MASTER_1_HOST_IP}
     slave_1:
         image: mysql:5.7.27
+        container_name: ${SLAVE_1_HOSTNAME}
         hostname: ${SLAVE_1_HOSTNAME}
         volumes:
             - ../conf/slave1.cnf:/etc/mysql/conf.d/my.cnf:ro
@@ -27,6 +29,7 @@ services:
             replication_network:
                 ipv4_address: ${SLAVE_1_HOST_IP}
     master_2:
+        container_name: ${MASTER_2_HOSTNAME}
         image: mysql:5.7.27
         hostname: ${MASTER_2_HOSTNAME}
         volumes:
@@ -40,6 +43,7 @@ services:
                 ipv4_address: ${MASTER_2_HOST_IP}
     slave_2:
         image: mysql:5.7.27
+        container_name: ${SLAVE_2_HOSTNAME}
         hostname: ${SLAVE_2_HOSTNAME}
         volumes:
             - ../conf/slave2.cnf:/etc/mysql/conf.d/my.cnf:ro

start

@@ -6,7 +6,7 @@ source check_params.sh
 
 check_docker_config
 
-if [ $file_found -eq 1 ]
+if [ $file_found -eq 1 ];
 then
     echo Using docker configuration file : $file
     echo

stop

@@ -6,11 +6,14 @@ source check_params.sh
 
 check_docker_config
 
-echo "Using configuration file $file"
-echo
-docker-compose -f $file down
+if [ $file_found -eq 1 ];
+then
+    echo "Using configuration file $file"
+    echo
+    docker-compose -f $file down
+fi
 
-if [ "$2" == "clean" ]
+if [ "$2" == "clean" ];
 then
     for node in "master" "slave"
     do