From a58d229c550d5aedaf3ecbe5e144d647f8a78162 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Thu, 25 Aug 2016 09:55:56 -0400 Subject: [PATCH] Cleaning up module installs for style purposes, correct version reflected --- Dockerfile | 9 +++++++-- common.bash | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9b7934..a63d9c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM bigfleet/centos7base # Define args and set a default value ARG maintainer=tier ARG imagename=shibboleth_sp -ARG version=1.0 +ARG version=2.5.1 MAINTAINER $maintainer LABEL Vendor="Internet2" @@ -16,7 +16,12 @@ LABEL Build docker build --rm --tag $maintainer/$imagename . 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 && yum -y install shibboleth.x86_64 httpd mod_ssl && yum clean all \ + && yum -y update \ + && yum -y install \ + httpd \ + mod_ssl \ + shibboleth.x86_64 \ + && yum clean all \ && rm /etc/httpd/conf.d/autoindex.conf \ && rm /etc/httpd/conf.d/ssl.conf \ && rm /etc/httpd/conf.d/userdir.conf \ diff --git a/common.bash b/common.bash index 7ffb16a..f9c7275 100644 --- a/common.bash +++ b/common.bash @@ -1,2 +1,3 @@ maintainer="bigfleet" -imagename="shibboleth_sp" \ No newline at end of file +imagename="shibboleth_sp" +version="2.5.1" \ No newline at end of file