From 1acc99d547d14fb9cf2fb422e775bbd8ef185310 Mon Sep 17 00:00:00 2001
From: Christopher hubing <chubing@internet2.edu>
Date: Fri, 22 Sep 2017 20:51:22 +0000
Subject: [PATCH] fixed port settings for www

---
 test-compose/docker-compose.yml |  7 +++----
 test-compose/www/Dockerfile     | 17 +++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index 67759e5..a9a360f 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -49,12 +49,11 @@ services:
 
   www:
     build: ./www/
-    command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /usr/bin/startup.sh"
     depends_on: 
      - data
-    expose:
-     - "80"
-     - "443"
+    ports:
+     - "80:80"
+     - "443:443"
     networks:
      - back
      - front
diff --git a/test-compose/www/Dockerfile b/test-compose/www/Dockerfile
index 2a0fa24..42bb842 100644
--- a/test-compose/www/Dockerfile
+++ b/test-compose/www/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/grouper-www:2.3.0
+FROM tier/shibboleth_sp
 
 
 #set labels
@@ -8,14 +8,15 @@ LABEL ImageName=$imagename
 LABEL ImageOS=centos7
 LABEL Version=$VERSION
 
+RUN yum update -y 
 
 # Replace the contents of the files in the following 2 lines with web server cert and private key
-COPY container_files/cert/localhost.crt /etc/pki/tls/certs 
-COPY container_files/cert/localhost.key /etc/pki/tls/private
+COPY container_files/httpd/localhost.crt /etc/pki/tls/certs 
+COPY container_files/httpd/localhost.key /etc/pki/tls/private
 
 # Replace the contents of the files in the following 2 lines with shibboleth cert and private key
-COPY container_files/shib/sp-cert.pem /etc/shibboleth 
-COPY container_files/shib/sp-key.pem /etc/shibboleth 
+COPY container_files/shibboleth/sp-cert.pem /etc/shibboleth 
+COPY container_files/shibboleth/sp-key.pem /etc/shibboleth 
 
 # Make sure to modify the entityID value in this file with that of your SP
 COPY container_files/shibboleth/shibboleth2.xml /etc/shibboleth/shibboleth2.xml
@@ -23,14 +24,14 @@ COPY container_files/shibboleth/shibboleth2.xml /etc/shibboleth/shibboleth2.xml
 # Intermediate cert for certs issued through the InCommon Cert Service
 COPY container_files/httpd/comodo.cer /etc/pki/tls/certs
 
-COPY container_files/shib/attribute-map.xml /etc/shibboleth 
+COPY container_files/shibboleth/attribute-map.xml /etc/shibboleth 
 COPY container_files/bin/httpd-shib-foreground /opt/bin/
 
 # Uncomment the following line to turn on shib SP debugging
 #COPY container_files/shibboleth/shibd.logger /etc/shibboleth/shibd.logger
-COPY container_files/httpd/www.conf /etc/httpd/conf.d/
+COPY container_files/httpd/grouper-www.conf /etc/httpd/conf.d/
 COPY container_files/httpd/logout.php /var/www/cgi-bin/logout.php
-ADD container_files/bin/startup.sh /usr/bin/startup.sh
+COPY container_files/bin/startup.sh /usr/bin/startup.sh
 
 RUN chmod +x /usr/bin/startup.sh && \
     chmod +x /opt/bin/httpd-shib-foreground && \