From 2b61eead49d2ef2b84053c6cbe479c97e6513ec1 Mon Sep 17 00:00:00 2001
From: villadalmine <rino@atadata.com>
Date: Wed, 7 Sep 2016 17:03:40 -0300
Subject: [PATCH] Added changes in dockerfile

---
 Dockerfile                   |  3 ++-
 container_files/bin/start.sh | 41 ------------------------------------
 container_files/configure.sh | 13 ------------
 docker-compose.yml           |  3 ++-
 4 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100755 container_files/bin/start.sh
 delete mode 100755 container_files/configure.sh

diff --git a/Dockerfile b/Dockerfile
index 5ff4688..1614ac3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ ENV VERSION=$version
 ENV TOMCAT_VERSION="6.0.35"
 
 ADD ./container_files /opt/
+COPY container_files/firsttimerunning /tmp
 COPY conf/grouper.hibernate.properties /opt/grouper/$version
-
 RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
     ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
     rm /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
@@ -20,3 +20,4 @@ RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.propert
 
 RUN ls /root && ls -l /tmp && cat /opt/grouper/$version/grouper.hibernate.properties && cat /opt/grouper/$version/grouper.installer.properties
 VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs
+VOLUME /etc/httpd/logs
diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh
deleted file mode 100755
index 5eb9390..0000000
--- a/container_files/bin/start.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-log="/tmp/start-starting.log"
-date >> $log
-if [ -z ${COMPOSE+x} ]
-then
-  echo "Not composed so not waiting for MariaDB: " > $log
-  /opt/bin/main.sh
-  laststatus="$?"
-  echo "Not composed status: $laststatus"
-  if [ "$laststatus" != "0" ]; then
-      echo "Not composed non-zero exit status: $laststatus" >> $log
-      echo "Not composed non-zero exit status: $laststatus"
-      exit 1
-  else
-      echo "Grouper was configured"
-      sleep 8000
-  fi
-else
-  echo "Composed so waiting for MariaDB: " > $log
-  echo "Testing connectivy to database before continue with install"
-  mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -h "$MYSQL_HOST" -e "use grouper; show tables;"
-  laststatus="$?"
-  while [ "$laststatus" != "0" ]; do
-  mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -h "$MYSQL_HOST" -e "use grouper; show tables;"
-  laststatus="$?"
-  sleep 5
-  echo "Trying to connect to mariadb container with $MYSQL_USER to database $MYSQL_DATABASE"
-  done
-  /opt/bin/main.sh
-  laststatus="$?"
-  echo "Composed status: $laststatus"
-  if [ "$laststatus" != "0" ]; then
-      echo "Composed non-zero exit status: $laststatus" >> $log
-      echo "Composed non-zero exit status: $laststatus"
-      exit 1
-  else
-      echo "Grouper was configured"
-      sleep 800000
-  fi
-fi
diff --git a/container_files/configure.sh b/container_files/configure.sh
deleted file mode 100755
index fd9739a..0000000
--- a/container_files/configure.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-sed -i "s|#GROUPER_SYSTEM_PASSWORD#|$GROUPER_SYSTEM_PASSWORD|g" /opt/grouper/2.3.0/grouper.installer.properties
-
-sed -i "s|#MYSQL_HOST#|$MYSQL_HOST|g" /opt/grouper/2.3.0/grouper.hibernate.properties
-
-sed -i "s|#MYSQL_USER#|$MYSQL_USER|g" /opt/grouper/2.3.0/grouper.hibernate.properties
-
-sed -i "s|#MYSQL_PASSWORD#|$MYSQL_PASSWORD|g" /opt/grouper/2.3.0/grouper.hibernate.properties
-
-sed -i "s|#MYSQL_DATABASE#|$MYSQL_DATABASE|g" /opt/grouper/2.3.0/grouper.hibernate.properties
-
-cat /opt/grouper/2.3.0/grouper.hibernate.properties
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4afe5b5..887de7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,8 @@ services:
      - NET_ADMIN
      - SYS_ADMIN
     volumes:
-     - ./logs:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
+     - ./logs/apache-tomcat:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
+     - ./logs/httpd:/etc/httpd/logs
     env_file:
      - conf/common.env
      - conf/grouper.env