From 81bff4213f864d9de31ebcdaf85da3a6f0fe1ab1 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Fri, 23 Sep 2016 10:29:59 -0400
Subject: [PATCH] Local tests show https request possible

---
 Dockerfile                           |  4 +---
 container_files/bin/configure.sh     | 10 ++++++----
 container_files/bin/configure_php.sh |  9 +++++++++
 tests/image.bats                     |  4 ----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 279ba20..dadee78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,7 +106,7 @@ ENV MYSQL_PASSWORD "WJzesbe3poNZ91qIbmR7"
 ENV ADMIN_FAMILY "admin"
 ENV ADMIN_USERNAME "admin"
 ENV ADMIN_NAME "admin"
-ENV TERM "testterm"
+
 # How long will we wait for MariaDB to start up?
 ENV WAIT_TIME 60
 
@@ -130,8 +130,6 @@ RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf &&  \
     ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry && \
     rm /etc/httpd/conf/httpd.conf && \
     ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf && \
-    mkdir -p /opt/comanage/comanage-registry-$version/local/tmp/cache && \
-    chmod 777 /opt/comanage/comanage-registry-$version/local/tmp/cache && \
     /opt/autoexec/bin/onbuild.sh
     
   
diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh
index 964ac15..715fa42 100755
--- a/container_files/bin/configure.sh
+++ b/container_files/bin/configure.sh
@@ -14,11 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-/opt/bin/configure_httpd.sh
 
-/opt/bin/configure_shibd.sh
-
-/opt/bin/configure_php.sh
+log="/opt/log/start-configure.log"
+set -e
+echo "Configuring" > $log
+/opt/bin/configure_httpd.sh >> $log
+/opt/bin/configure_shibd.sh >> $log
+/opt/bin/configure_php.sh >> $log
 
 
 
diff --git a/container_files/bin/configure_php.sh b/container_files/bin/configure_php.sh
index 6d3b034..c6f7c22 100755
--- a/container_files/bin/configure_php.sh
+++ b/container_files/bin/configure_php.sh
@@ -36,6 +36,15 @@ else
   echo "Variables are not totally filled so no configuration was performed" >> $log
 
 fi
+date >> $log
+echo "Preparing for cache" >> $log
+mkdir -p /opt/comanage/comanage-registry-$VERSION/local/tmp/cache/persistent && \
+mkdir -p /opt/comanage/comanage-registry-$VERSION/local/tmp/cache/models && \  
+chmod -R 777 /opt/comanage/comanage-registry-$VERSION/local/tmp/cache && \
+chown -R apache:apache /opt/comanage/comanage-registry-$VERSION/local/tmp/cache && \
+echo "Cache status: " >> $log
+ls -la /opt/comanage/comanage-registry-$VERSION/local/tmp/cache >> $log
+
 date >> $log
 if [ -z ${COMPOSE+x} ];then
   echo "Comanage is not composed no database configuration will be perform" >> $log
diff --git a/tests/image.bats b/tests/image.bats
index 0293299..71ff5be 100644
--- a/tests/image.bats
+++ b/tests/image.bats
@@ -33,8 +33,4 @@ load ../common
   docker run -i $maintainer/$imagename ls -la /opt/autoexec/bin/firstrun.sh
 }
 
-@test "Cache directory created" {
-  docker run -i $maintainer/$imagename find /opt/comanage/comanage-registry-1.0.5/app/tmp/cache
-}
-