diff mbox series

[2/3] docker: Simplify MySQL reset

Message ID 20190903170304.24325-2-stephen@that.guru
State Accepted
Headers show
Series [1/3] Drop support for Python 3.4, add Python 3.7 | expand

Commit Message

Stephen Finucane Sept. 3, 2019, 5:03 p.m. UTC
Just use the hardcoded configuration.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 tools/docker/Dockerfile    | 3 ---
 tools/docker/entrypoint.sh | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

Comments

Stephen Finucane Sept. 8, 2019, 5:55 p.m. UTC | #1
On Tue, 2019-09-03 at 18:03 +0100, Stephen Finucane wrote:
> Just use the hardcoded configuration.
> 
> Signed-off-by: Stephen Finucane <stephen@that.guru>

Trivial fix. Applied.
diff mbox series

Patch

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';