Fixing password error, being explicit about volume

docker · Sep 5, 2016 · b208e46 · b208e46
1 parent ec2c2f5
commit b208e46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/conf/grouper.env b/conf/grouper.env
@@ -1,4 +1,5 @@
 VERSION=2.3.0
 TOMCAT_VERSION=6.0.35
 GROUPER_SYSTEM_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
-MYSQL_HOST=mariadb
+MYSQL_HOST=mariadb
+WAIT_TIME=600
diff --git a/conf/grouper.hibernate.properties b/conf/grouper.hibernate.properties
@@ -42,4 +42,4 @@ hibernate.connection.username         = #MYSQL_USER#
 # If you are using an empty password, depending upon your version of
 # Java and Ant you may need to specify a password of "".
 # Note: you can keep passwords external and encrypted: https://bugs.internet2.edu/jira/browse/GRP-122
-hibernate.connection.password         = #MYSQL_USER#
+hibernate.connection.password         = #MYSQL_PASSWORD#
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
      - NET_ADMIN
      - SYS_ADMIN
     volumes:
-     - ./mysql:/var/lib/mysqlmounted
+     - mysql:/var/lib/mysqlmounted
     env_file:
       - conf/common.env
       - conf/db.env
@@ -37,10 +37,13 @@ services:
     env_file:
       - conf/common.env
       - conf/grouper.env
-    links:
+    depends_on:
       - mariadb
 
 networks:
   i2network:
     driver: bridge
 
+volumes:
+  mysql:
+    driver: local