From ec2c2f50f69c4848cc876178ccefe4d0dba511f7 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Fri, 2 Sep 2016 14:47:29 -0400
Subject: [PATCH] Restructuring to match refactor

---
 .gitignore                             | 1 +
 Dockerfile                             | 4 ++--
 conf/common.env                        | 1 +
 container_files/{ => bin}/configure.sh | 0
 docker-compose.yml                     | 8 ++++----
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename container_files/{ => bin}/configure.sh (100%)

diff --git a/.gitignore b/.gitignore
index 811f8fa..2a821bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ bin/run.sh
 bin/start.sh
 bin/stop.sh
 bin/test.sh
+mysql
diff --git a/Dockerfile b/Dockerfile
index 406af43..44aa916 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ ENV MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
 ENV GROUPER_SYSTEM_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
 ENV MYSQL_HOST=mariadb
 
-ADD ./container_files /root
+ADD ./container_files /opt
 COPY conf/grouper.hibernate.properties /opt/grouper/$version
 
 RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
@@ -25,4 +25,4 @@ RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.propert
     rm /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
     ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties
 
-VOLUME /opt/grouper/2.3.0/apache-tomcat-$TOMCAT_VERSION/logs
\ No newline at end of file
+#VOLUME /opt/grouper/2.3.0/apache-tomcat-$TOMCAT_VERSION/logs
\ No newline at end of file
diff --git a/conf/common.env b/conf/common.env
index 8f03076..40d9c84 100644
--- a/conf/common.env
+++ b/conf/common.env
@@ -1,3 +1,4 @@
+COMPOSE=true
 MYSQL_DATABASE=grouper
 MYSQL_USER=grouper_user
 MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
\ No newline at end of file
diff --git a/container_files/configure.sh b/container_files/bin/configure.sh
similarity index 100%
rename from container_files/configure.sh
rename to container_files/bin/configure.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 44b2ad0..b410b8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 
 services:
-  db:
+  mariadb:
     image: bigfleet/mariadb
     container_name: mariadb
     hostname: mariadb
@@ -23,8 +23,6 @@ services:
     image: my/grouper
     container_name: grouper
     hostname: grouper
-    depends_on:
-     - db
     networks: 
      - i2network
     ports:
@@ -35,10 +33,12 @@ services:
      - NET_ADMIN
      - SYS_ADMIN
     volumes:
-     - logs:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
+     - ./logs:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
     env_file:
       - conf/common.env
       - conf/grouper.env
+    links:
+      - mariadb
 
 networks:
   i2network: