added workaround for odd user creation failure in mysql

tgraupne · Nov 19, 2015 · 444a88b · 444a88b
1 parent 47e0c99
commit 444a88b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/zurmo_galera_cluster/docker/docker-entrypoint.sh b/zurmo_galera_cluster/docker/docker-entrypoint.sh
@@ -75,6 +75,9 @@ EOSQL
     export MYSQL_USER=${MYSQL_USER:-zurmo}
     export MYSQL_PASSWORD=${MYSQL_PASSWORD:-zurmo}
     if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
+      # workaround for MySQL bug not allowing to add previously deleted users
+      echo "DROP USER '$MYSQL_USER'@'%';" >> "$tempSqlFile"
+      echo "FLUSH PRIVILEGES ;" >> "$tempSqlFile"
       echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" >> "$tempSqlFile"
 
       if [ "$MYSQL_DATABASE" ]; then

diff --git a/zurmo_haproxy/docker/build-image.sh b/zurmo_haproxy/docker/build-image.sh
@@ -1 +1 @@
-sudo docker build -t="icclabcna/zurmo_haproxy" .
+sudo docker build -t="icclabcna/zurmo_haproxy:master" .
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sudo docker build -t="icclabcna/zurmo_haproxy" .
		sudo docker build -t="icclabcna/zurmo_haproxy:master" .