Skip to content
Permalink
Browse files

Expanded tests to include wrapper entrypoint

  • Loading branch information
Jim Van Fleet
Jim Van Fleet committed Sep 19, 2016
1 parent a34c6b7 commit 8bbdc658d64b2607d8aed156e4b869d1c0cb225f
Showing with 10 additions and 4 deletions.
  1. +6 −4 Dockerfile
  2. +4 −0 tests/image.bats
@@ -14,6 +14,9 @@ LABEL Version=$version

LABEL Build docker build --rm --tag $maintainer/$imagename .

# Add starters and installers
ADD ./container_files /opt

RUN curl -o /etc/yum.repos.d/security:shibboleth.repo \
http://download.opensuse.org/repositories/security://shibboleth/CentOS_7/security:shibboleth.repo \
&& yum -y update \
@@ -25,10 +28,9 @@ RUN curl -o /etc/yum.repos.d/security:shibboleth.repo \
&& rm /etc/httpd/conf.d/autoindex.conf \
&& rm /etc/httpd/conf.d/ssl.conf \
&& rm /etc/httpd/conf.d/userdir.conf \
&& rm /etc/httpd/conf.d/welcome.conf

# Add starters and installers
ADD ./container_files /opt
&& rm /etc/httpd/conf.d/welcome.conf \
&& chmod +x /opt/bin/httpd-shib-foreground \
&& chmod +x /opt/bin/shibboleth_keygen.sh

#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
@@ -20,4 +20,8 @@ load ../common

@test "Includes Shibboleth keygenerator" {
docker run -i $maintainer/$imagename find /opt/bin/shibboleth_keygen.sh
}

@test "Includes httpd + shibd startup script" {
docker run -i $maintainer/$imagename find /opt/bin/httpd-shib-foreground
}

0 comments on commit 8bbdc65

Please sign in to comment.
You can’t perform that action at this time.