Merge pull request #3 from docker/shibupdate

Moved files in order to use the same structure /opt/* and added chang…
docker · Sep 15, 2016 · a34c6b7fd78ec37cc319d4a21c4b25945d6906d5 · a34c6b7
2 parents 6d06950 + bf3c7aa
commit a34c6b7fd78ec37cc319d4a21c4b25945d6906d5
diff --git a/Dockerfile b/Dockerfile
@@ -29,18 +29,9 @@ RUN curl -o /etc/yum.repos.d/security:shibboleth.repo \
 
 # Add starters and installers
 ADD ./container_files /opt
-
-COPY httpd-shib-foreground /usr/local/bin/
-COPY conf/attribute-map.xml /opt/etc/shibboleth/attribute-map.xml
-COPY conf/inc-md-cert.pem /opt/etc/shibboleth/inc-md-cert.pem
-COPY conf/shibboleth_keygen.sh /opt/bin/shibboleth_keygen.sh
 
-#Added ssl default conf
-RUN ln -s /opt/etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf
-
-#Added shib module apache
-RUN ln -s /opt/etc/httpd/conf.modules.d/00-shib.conf /etc/httpd/conf.modules.d/00-shib.conf
-RUN ln -s /usr/lib64/shibboleth/mod_shib_24.so /etc/httpd/modules/mod_shib_24.so
+#Script to start service, Added ssl default conf, Added shib module apache
+RUN ln -s /opt/bin/httpd-shib-foreground  /usr/local/bin && ln -s /opt/etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf && ln -s /opt/etc/httpd/conf.modules.d/00-shib.conf /etc/httpd/conf.modules.d/00-shib.conf && ln -s /usr/lib64/shibboleth/mod_shib_24.so /etc/httpd/modules/mod_shib_24.so
 
 EXPOSE 80 443
 CMD ["httpd-shib-foreground"]
diff --git a/httpd-shib-foreground → container_files/bin/httpd-shib-foreground b/httpd-shib-foreground → container_files/bin/httpd-shib-foreground
diff --git a/conf/shibboleth_keygen.sh → container_files/bin/shibboleth_keygen.sh b/conf/shibboleth_keygen.sh → container_files/bin/shibboleth_keygen.sh
diff --git a/conf/attribute-map.xml → ...er_files/etc/shibboleth/attribute-map.xml b/conf/attribute-map.xml → ...er_files/etc/shibboleth/attribute-map.xml
diff --git a/conf/inc-md-cert.pem → ...iner_files/etc/shibboleth/inc-md-cert.pem b/conf/inc-md-cert.pem → ...iner_files/etc/shibboleth/inc-md-cert.pem