introduce environment variables WEBWORK_DB_USER and WEBWORK_DB_PASSWORD

and remove comments on old default
Alex-Jordan · Aug 20, 2019 · cf7e0f8 · cf7e0f8
1 parent f4d3573
commit cf7e0f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,4 @@
 COURSES_DIRECTORY_ON_HOST=../ww-docker-data/courses
 WEBWORK2_HTTP_PORT_ON_HOST=8080
+WEBWORK_DB_USER=webworkWrite
+WEBWORK_DB_PASSWORD=passwordRWsetItBeforeFirstStartingTheDBcontainer
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,10 +20,8 @@ services:
       # When the MariaDB container is first started it will create
       #    the WW database and WW DB user based on:
       MYSQL_DATABASE: webwork
-      MYSQL_USER: webworkWrite
-      MYSQL_PASSWORD: passwordRWsetItBeforeFirstStartingTheDBcontainer
-      # Old default:
-      #MYSQL_PASSWORD: passwordRW
+      MYSQL_USER: ${WEBWORK_DB_USER}
+      MYSQL_PASSWORD: ${WEBWORK_DB_PASSWORD}
 
   app:
     image: webwork
@@ -140,10 +138,7 @@ services:
 
       APACHE_RUN_GROUP: www-data
 
-      WEBWORK_DB_PASSWORD: passwordRWsetItBeforeFirstStartingTheDBcontainer
-      # should be the same password as MYSQL_PASSWORD above.
-      # Old default:
-      #WEBWORK_DB_PASSWORD: passwordRW
+      WEBWORK_DB_PASSWORD: ${WEBWORK_DB_PASSWORD}
 
       # =======================================================
       # Local configuration variables: