Merge pull request #737 from winfried-van-loon/master

Fixing MariaDB root password variable. #736
laradock · Apr 4, 2017 · b083124 · b083124
2 parents 2b11fc2 + 37dee56
commit b083124
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -204,7 +204,7 @@ services:
         - MYSQL_DATABASE=${MARIADB_DATABASE}
         - MYSQL_USER=${MARIADB_USER}
         - MYSQL_PASSWORD=${MARIADB_PASSWORD}
-        - MYSQL_ROOT_PASSWORD=${MARIADB_PORT}
+        - MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
       networks:
         - backend
 

diff --git a/env-example b/env-example
@@ -79,6 +79,7 @@ MARIADB_DATABASE=default
 MARIADB_USER=default
 MARIADB_PASSWORD=secret
 MARIADB_PORT=3306
+MARIADB_ROOT_PASSWORD=root
 
 ### POSTGRES Container
 POSTGRES_DB=default