From 753a8cb667ea375dfd913769474c601bc2414cc7 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Tue, 9 Aug 2016 23:26:32 +0530
Subject: [PATCH] updated module to fix `MARIADB_MASTER_PORT` env param

Fixes #55
---
 bitnami/mariadb/Dockerfile |  2 +-
 bitnami/mariadb/test.sh    | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/bitnami/mariadb/Dockerfile b/bitnami/mariadb/Dockerfile
index 2d572f2842fc..92189b6945b8 100644
--- a/bitnami/mariadb/Dockerfile
+++ b/bitnami/mariadb/Dockerfile
@@ -20,7 +20,7 @@ ENV BITNAMI_IMAGE_VERSION=10.1.14-r2 \
     BITNAMI_APP_NAME=mariadb \
     BITNAMI_APP_USER=mysql
 
-RUN bitnami-pkg unpack mariadb-10.1.14-2 --checksum 2d70b08d8289b71695f3bb5a9517129dd1449e465896ff7e2441b9027e66009a
+RUN bitnami-pkg unpack mariadb-10.1.14-3 --checksum 261d55ed7759cc6708750ff3baa84365f9b00473b7673868d12ac03875ae9823
 ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
 
 COPY rootfs/ /
diff --git a/bitnami/mariadb/test.sh b/bitnami/mariadb/test.sh
index 5215177e0930..131a7057e316 100755
--- a/bitnami/mariadb/test.sh
+++ b/bitnami/mariadb/test.sh
@@ -279,6 +279,34 @@ cleanup_environment
   [[ "$output" =~ "name: Marko" ]]
 }
 
+@test "Can setup master/slave replication using a custom master port" {
+  container_create default -d -p 3306 \
+    -e MARIADB_REPLICATION_MODE=master \
+    -e MARIADB_REPLICATION_USER=$MARIADB_REPLICATION_USER \
+    -e MARIADB_REPLICATION_PASSWORD=$MARIADB_REPLICATION_PASSWORD \
+    -e MARIADB_ROOT_PASSWORD=$MARIADB_PASSWORD \
+    -e MARIADB_DATABASE=$MARIADB_DATABASE
+
+  MASTER_HOST=$(container_exec default ip route list | grep ^default | awk '{print $3}')
+  MASTER_PORT=$(docker port $CONTAINER_NAME-default 3306/tcp | cut -d':' -f2)
+  container_create slave0 -d \
+    -e MARIADB_REPLICATION_MODE=slave \
+    -e MARIADB_REPLICATION_USER=$MARIADB_REPLICATION_USER \
+    -e MARIADB_REPLICATION_PASSWORD=$MARIADB_REPLICATION_PASSWORD \
+    -e MARIADB_MASTER_HOST=$MASTER_HOST \
+    -e MARIADB_MASTER_PORT=$MASTER_PORT \
+    -e MARIADB_MASTER_PASSWORD=$MARIADB_PASSWORD \
+    -e MARIADB_ROOT_PASSWORD=$MARIADB_PASSWORD \
+    -e MARIADB_DATABASE=$MARIADB_DATABASE
+
+  mysql_client default -uroot -p$MARIADB_PASSWORD $MARIADB_DATABASE -e \
+    "CREATE TABLE users (id INT AUTO_INCREMENT, name VARCHAR(30), datum TIMESTAMP DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY(id)); \
+     INSERT INTO users(name) VALUES ('Marko');"
+
+  run mysql_client slave0 -uroot -p$MARIADB_PASSWORD $MARIADB_DATABASE -e "SELECT * FROM users\G"
+  [[ "$output" =~ "name: Marko" ]]
+}
+
 @test "Can setup master/slave replication with password for replication user" {
   container_create default -d \
     -e MARIADB_REPLICATION_MODE=master \