From fc7951f0645015e1ba577121d3bc759e20bb03ad Mon Sep 17 00:00:00 2001 From: villadalmine Date: Tue, 13 Sep 2016 19:43:42 -0300 Subject: [PATCH 1/2] Moved files in order to use the same structure /opt/* and added changes to dockerfile --- Dockerfile | 8 +++----- .../bin/httpd-shib-foreground | 0 {conf => container_files/bin}/shibboleth_keygen.sh | 0 .../etc/shibboleth}/attribute-map.xml | 0 {conf => container_files/etc/shibboleth}/inc-md-cert.pem | 0 5 files changed, 3 insertions(+), 5 deletions(-) rename httpd-shib-foreground => container_files/bin/httpd-shib-foreground (100%) rename {conf => container_files/bin}/shibboleth_keygen.sh (100%) rename {conf => container_files/etc/shibboleth}/attribute-map.xml (100%) rename {conf => container_files/etc/shibboleth}/inc-md-cert.pem (100%) diff --git a/Dockerfile b/Dockerfile index 43ca358..398c4ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,11 +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 + +#Script to start service +RUN ln -s /opt/bin/httpd-shib-foreground /usr/local/bin #Added ssl default conf RUN ln -s /opt/etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf diff --git a/httpd-shib-foreground b/container_files/bin/httpd-shib-foreground similarity index 100% rename from httpd-shib-foreground rename to container_files/bin/httpd-shib-foreground diff --git a/conf/shibboleth_keygen.sh b/container_files/bin/shibboleth_keygen.sh similarity index 100% rename from conf/shibboleth_keygen.sh rename to container_files/bin/shibboleth_keygen.sh diff --git a/conf/attribute-map.xml b/container_files/etc/shibboleth/attribute-map.xml similarity index 100% rename from conf/attribute-map.xml rename to container_files/etc/shibboleth/attribute-map.xml diff --git a/conf/inc-md-cert.pem b/container_files/etc/shibboleth/inc-md-cert.pem similarity index 100% rename from conf/inc-md-cert.pem rename to container_files/etc/shibboleth/inc-md-cert.pem From bf3c7aa718f42361440ef8e267ea476af29549da Mon Sep 17 00:00:00 2001 From: villadalmine Date: Thu, 15 Sep 2016 15:31:14 -0300 Subject: [PATCH 2/2] Added Run --- Dockerfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 398c4ec..f7423ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,15 +30,8 @@ RUN curl -o /etc/yum.repos.d/security:shibboleth.repo \ # Add starters and installers ADD ./container_files /opt -#Script to start service -RUN ln -s /opt/bin/httpd-shib-foreground /usr/local/bin - -#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"]