Fix broken SQL indents and run init.sh only once

Dockerfile

@@ -1,6 +1,6 @@
 FROM mariadb:10.3
 
-COPY mariadb/init.sh /docker-entrypoint-initdb.d/
+COPY mariadb/init.sh /usr/local/bin/
 COPY mariadb/entrypoint.sh /usr/local/bin/master-slave-entrypoint.sh
 
 ENTRYPOINT ["master-slave-entrypoint.sh"]

README.md

@@ -2,13 +2,10 @@
 
 > MariaDB 10.3 dockerized with replication. Master/Slave setup in 30 seconds.
 
+> Added features for Docker swarm setups
 
 ## How to use
 
-### Docker run
-
-@TODO
-
 ### Docker compose
 
 Example docker-compose.yml for mariadb replication:
@@ -18,7 +15,7 @@ version: '3'
 
 services:
     db-master:
-        image: caffeina/mariadb-replication
+        image: *your docker registry*
         restart: always
         volumes:
             - db-master-data:/var/lib/mysql:rw
@@ -27,7 +24,7 @@ services:
             MYSQL_ROOT_PASSWORD: "mastersecret"
 
     db-slave:
-        image: caffeina/mariadb-replication
+        image: *your docker registry*
         restart: always
         depends_on:
             - db-master
@@ -44,16 +41,14 @@ volumes:
     db-slave-data:
 ```
 
-@TODO
-
 ```bash
 $ docker-compose up
 ```
 
-@TODO
+# Build and run
 
 ```bash
-$ docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
+$ docker-compose -f docker-compose.yml up --build
 ```
 
 
@@ -63,7 +58,7 @@ The `mariadb-replication` image is an extension of `mariadb:10.3`, you can use a
 
 ### Enviroment variables
 
-@TODO Sets the connection parameters to the master. The `MYSQL_MASTER_HOST` variable is required.
+Sets the connection parameters to the master (for slave container). The `MYSQL_MASTER_HOST` variable is required.
 
 ```yaml
 MYSQL_MASTER_HOST: "db-master"
@@ -72,27 +67,21 @@ MYSQL_MASTER_USER: "root" # (Optional) Default: 'root'
 MYSQL_MASTER_PASSWORD: "secret" # (Optional) Default: ''
 ```
 
-@TODO The generated user and password will be printed to stdout.
+The generated user and password will be printed to stdout.
 
 ```yaml
 MYSQL_GRANT_SLAVE_USER: "user" # (Optional) Default: *RANDOM STRING*
 MYSQL_GRANT_SLAVE_PASSWORD: "secret" # (Optional) Default: *RANDOM STRING*
 ```
 
-@TODO
-
 ```yaml
 SERVER_ID: 2 # (Optional) Default: *RANDOM INT*
 ```
 
-@TODO
-
 ```yaml
 EXPIRE_LOGS_DAYS: 5 # (Optional) Default: '10'
 ```
 
-@TODO
-
 ```yaml
 MAX_BINLOG_SIZE: "50M" # (Optional) Default: '100M'
 ```
@@ -109,30 +98,3 @@ MYSQL_SLAVE_SKIP_ERRORS: "all" # (Optional) Default: 'OFF'
 - Add `innodb-read-only` parameter (Service restart on first run is needed);
 - Move `/etc/mysql/conf.d/master-slave.cnf` in other path (So the user can bind a volume to `/etc/mysql/conf.d/` for custom configuration);
 - Permit replication on existing database.
-
-
-## Contributing
-
-How to get involved:
-
-1. [Star](https://github.com/gadiener/docker-mariadb-replication/stargazers) the project!
-2. Answer questions that come through [GitHub issues](https://github.com/gadiener/docker-mariadb-replication/issues?state=open)
-3. [Report a bug](https://github.com/gadiener/docker-mariadb-replication/issues/new) that you find
-
-This project follows the [GitFlow branching model](http://nvie.com/posts/a-successful-git-branching-model). The ```master``` branch always reflects a production-ready state while the latest development is taking place in the ```develop``` branch.
-
-Each time you want to work on a fix or a new feature, create a new branch based on the ```develop``` branch: ```git checkout -b BRANCH_NAME develop```. Only pull requests to the ```develop``` branch will be merged.
-
-Pull requests are **highly appreciated**.
-
-Solve a problem. Features are great, but even better is cleaning-up and fixing issues in the code that you discover.
-
-
-## Versioning
-
-This project is maintained by using the [Semantic Versioning Specification (SemVer)](http://semver.org).
-
-
-## Copyright and license
-
-Copyright 2017 [Caffeina](http://caffeina.com) srl under the [MIT license](LICENSE.md).

mariadb/entrypoint.sh

@@ -129,4 +129,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	fi
 fi
 
-docker-entrypoint.sh $@
+# Check if init.sh has been added and add status folder
+if [ ! -e "/docker-entrypoint-initdb.d/init.sh" ]; then
+   cp -f /usr/local/bin/init.sh /docker-entrypoint-initdb.d
+   chown mysql:mysql /status
+   chown mysql:mysql /docker-entrypoint-initdb.d/*
+fi
+
+docker-entrypoint.sh $@

mariadb/init.sh

@@ -62,7 +62,7 @@ if [ ! -z "$MYSQL_MASTER_HOST" ]; then
 		sleep 1
 	done
 
-	if [ ! -z "$MYSQL_GRANT_SLAVE_USER" -a ! -z "$MYSQL_GRANT_SLAVE_PASSWORD" ]; then
+	if [ -z "$MYSQL_GRANT_SLAVE_USER" ] || [ -z "$MYSQL_GRANT_SLAVE_PASSWORD" ]; then
 		export MYSQL_GRANT_SLAVE_USER="$(pwgen -1 16)"
 		echo "GENERATED SLAVE USER: $MYSQL_GRANT_SLAVE_USER"
 
@@ -73,20 +73,29 @@ if [ ! -z "$MYSQL_MASTER_HOST" ]; then
 		"${master_mysql[@]}" <<-EOSQL
 			GRANT REPLICATION SLAVE ON *.* TO '$MYSQL_GRANT_SLAVE_USER'@'%' IDENTIFIED BY '$MYSQL_GRANT_SLAVE_PASSWORD';
 			FLUSH PRIVILEGES;
-		EOSQL
+EOSQL
 
 	fi
+
+	# If the user sets these then just run the SQL grant for replicaton user
+	if [ ! -z "$MYSQL_GRANT_SLAVE_USER" ] || [ ! -z "$MYSQL_GRANT_SLAVE_PASSWORD" ]; then
+
+                "${master_mysql[@]}" <<-EOSQL
+                        GRANT REPLICATION SLAVE ON *.* TO '$MYSQL_GRANT_SLAVE_USER'@'%' IDENTIFIED BY '$MYSQL_GRANT_SLAVE_PASSWORD';
+                        FLUSH PRIVILEGES;
+EOSQL
+        fi
 
 	"${master_mysql[@]}" <<-EOSQL > $MYSQL_STATUS 2>&1
 		FLUSH TABLES WITH READ LOCK;
 		SHOW MASTER STATUS;
-	EOSQL
+EOSQL
 
 	"${master_mysqldump[@]}" > $MYSQL_EXPORT 2>&1
 
 	"${master_mysql[@]}" <<-EOSQL
 		UNLOCK TABLES;
-	EOSQL
+EOSQL
 
 	## SLAVE
 
@@ -120,7 +129,7 @@ if [ ! -z "$MYSQL_MASTER_HOST" ]; then
 			MASTER_CONNECT_RETRY=$MYSQL_MASTER_CONNECT_RETRY;
 		START SLAVE;
 		SHOW SLAVE STATUS\G
-	EOSQL
+EOSQL
 
 	if [ -e "$MYSQL_STATUS" ]; then
 		rm -f $MYSQL_STATUS
@@ -151,7 +160,7 @@ else
 
 	"${master_mysql[@]}" <<-EOSQL
 		SHOW MASTER STATUS\G
-	EOSQL
+EOSQL
 
 	echo
 	echo 'MySQL master process done. Ready for replication.'