Pivoting to www/app/db architecture

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/.

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

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" {