From 5947382ba87729b9f80428f11e2cd77ceaef49d6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 13 Dec 2018 12:40:30 -0600
Subject: Conditionally setup database users

Due to `getent` now always returning a value for both `postgres` and
`mysql`, we were always attempting to create database users even when
`SETUP_DB` was false.

We now check for service availability before attempting to create
database users.
---
 scripts/create_mysql_user.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts/create_mysql_user.sh')

diff --git a/scripts/create_mysql_user.sh b/scripts/create_mysql_user.sh
index 71c6169bfd0..6a11a9e12b1 100644
--- a/scripts/create_mysql_user.sh
+++ b/scripts/create_mysql_user.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
-mysql --user=root --host=127.0.0.1 <<EOF
-CREATE USER IF NOT EXISTS 'gitlab'@'127.0.0.1';
-GRANT ALL PRIVILEGES ON gitlabhq_test.* TO 'gitlab'@'127.0.0.1';
-FLUSH PRIVILEGES;
+if mysqladmin ping --user=root --host=127.0.0.1; then
+  mysql --user=root --host=127.0.0.1 <<EOF
+  CREATE USER IF NOT EXISTS 'gitlab'@'127.0.0.1';
+  GRANT ALL PRIVILEGES ON gitlabhq_test.* TO 'gitlab'@'127.0.0.1';
+  FLUSH PRIVILEGES;
 EOF
+fi
-- 
cgit v1.2.1