From ece6316fae9d862411c6dc630527cb805e3761a0 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Thu, 13 Jul 2017 15:18:38 -0400
Subject: [PATCH] Pivoting to www/app/db architecture

---
 Dockerfile                                     | 9 +++------
 container_files/etc/shibboleth/shibboleth2.xml | 3 ---
 container_files/usr/sbin/httpd-foreground      | 7 -------
 tests/image.bats                               | 4 ++--
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100755 container_files/usr/sbin/httpd-foreground

diff --git a/Dockerfile b/Dockerfile
index a9581ab..790d59d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,10 +15,7 @@ LABEL Version=$version
 LABEL Build docker build --rm --tag $maintainer/$imagename .
 
 ADD ./container_files /opt
-# This SP will connect via the TCP listener
-RUN rm /opt/bin/httpd-shib-foreground /etc/httpd/conf.d/ssl.conf && \
+
+RUN rm /etc/httpd/conf.d/ssl.conf && \
     cp /opt/etc/httpd/conf.d/*.conf /etc/httpd/conf.d/. && \
-    cp /opt/etc/shibboleth/* /etc/shibboleth/. && \
-    cp /opt/usr/sbin/httpd-foreground /usr/sbin/. && chmod +x /usr/sbin/httpd-foreground
-EXPOSE 80 443
-CMD ["/usr/sbin/httpd-foreground"]
+    cp /opt/etc/shibboleth/* /etc/shibboleth/.
diff --git a/container_files/etc/shibboleth/shibboleth2.xml b/container_files/etc/shibboleth/shibboleth2.xml
index 1dbe2fc..f3610a5 100644
--- a/container_files/etc/shibboleth/shibboleth2.xml
+++ b/container_files/etc/shibboleth/shibboleth2.xml
@@ -9,9 +9,6 @@
     By default, in-memory StorageService, ReplayCache, ArtifactMap, and SessionCache
     are used. See example-shibboleth2.xml for samples of explicitly configuring them.
     -->
-		
-
-	<TCPListener address="172.18.0.3" port="1600" acl="0.0.0.0"/>
 
     <!--
     To customize behavior for specific resources on Apache, and to link vhosts or
diff --git a/container_files/usr/sbin/httpd-foreground b/container_files/usr/sbin/httpd-foreground
deleted file mode 100755
index feb1ae2..0000000
--- a/container_files/usr/sbin/httpd-foreground
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /run/httpd/httpd.pid
-
-exec httpd -DFOREGROUND
\ No newline at end of file
diff --git a/tests/image.bats b/tests/image.bats
index 66f28f8..a936107 100644
--- a/tests/image.bats
+++ b/tests/image.bats
@@ -11,8 +11,8 @@ load ../common
   docker run -i $maintainer/$imagename find /etc/httpd/conf.d/log.conf
 }
 
-@test "shibboleth2.xml using a TCP Listener configuration" {
-  docker run -i $maintainer/$imagename grep TCPListener /etc/shibboleth/shibboleth2.xml
+@test "shibboleth2.xml not using a TCP Listener configuration" {
+  docker run -i $maintainer/$imagename grep -v TCPListener /etc/shibboleth/shibboleth2.xml
 }
 
 @test "Shibboleth configuration is well formed" {