Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-21 23:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from sameersbn/fix-master-port-spec

Browse Source 
updated module to fix `MARIADB_MASTER_PORT` env param
This commit is contained in:
Sameer Naik
2016-08-10 12:03:36 +05:30
committed by GitHub
parent 4965299200 753a8cb667
commit a4f602410d
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/mariadb/Dockerfile
View File

@@ -20,7 +20,7 @@ ENV BITNAMI_IMAGE_VERSION=10.1.14-r2 \
BITNAMI_APP_NAME=mariadb \ BITNAMI_APP_NAME=mariadb \
BITNAMI_APP_USER=mysql 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 ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
COPY rootfs/ / COPY rootfs/ /

28
bitnami/mariadb/test.sh
View File

@@ -279,6 +279,34 @@ cleanup_environment
[[ "$output" =~ "name: Marko" ]] [[ "$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" { @test "Can setup master/slave replication with password for replication user" {
container_create default -d \ container_create default -d \
-e MARIADB_REPLICATION_MODE=master \ -e MARIADB_REPLICATION_MODE=master \