From: Stephen Finucane <stephen@that.guru>
Date: Tue, 3 Sep 2019 14:45:55 +0000 (+0100)
Subject: docker: Simplify MySQL reset
X-Git-Tag: v2.2.0-rc1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=140453e5df61d4782656fffae0c8940a3e91de6b;p=thirdparty%2Fpatchwork.git

docker: Simplify MySQL reset

Just use the hardcoded configuration.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 81700711..556085ce 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -8,9 +8,6 @@ RUN [ -n "$UID" ] || { echo "You must define UID in .env" 1>&2; exit 1; }
 
 ENV PROJECT_HOME /home/patchwork/patchwork
 
-ENV db_user root
-ENV db_pass password
-
 ENV DJANGO_SETTINGS_MODULE patchwork.settings.dev
 ENV DEBIAN_FRONTEND noninteractive
 ENV PYTHONUNBUFFERED 1
diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh
index d2b094bd..08fa1906 100755
--- a/tools/docker/entrypoint.sh
+++ b/tools/docker/entrypoint.sh
@@ -22,7 +22,7 @@ test_database() {
 }
 
 reset_data_mysql() {
-    mysql -u$db_user -p$db_pass -h $PW_TEST_DB_HOST << EOF
+    mysql -uroot -ppassword -h $PW_TEST_DB_HOST << EOF
 DROP DATABASE IF EXISTS patchwork;
 CREATE DATABASE patchwork CHARACTER SET utf8;
 GRANT ALL ON patchwork.* TO 'patchwork' IDENTIFIED BY 'password';