diff options
| author | Markus Krogh <markus@nordu.net> | 2017-10-04 09:43:22 +0200 |
|---|---|---|
| committer | Markus Krogh <markus@nordu.net> | 2017-10-04 09:43:22 +0200 |
| commit | 5a9cf5691390fa41aff171085b5c5d321dbed115 (patch) | |
| tree | 61e36c270f6d667420efc899f26f0fa4dab2c6bf | |
| parent | 31def545e41fd4d3ca7754ff33460f15b50fe789 (diff) | |
Use 3.3.1
| -rw-r--r-- | idp/Dockerfile | 4 | ||||
| -rwxr-xr-x | idp/shib-entrypoint.sh | 2 | ||||
| -rw-r--r-- | idp/shibboleth-identity-provider-3.3.1.tar.gz.sha256 | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/idp/Dockerfile b/idp/Dockerfile index d812493..037d50b 100644 --- a/idp/Dockerfile +++ b/idp/Dockerfile @@ -2,14 +2,14 @@ FROM jetty:9-alpine MAINTAINER Jesper B. Rosenkilde <jbr@nordu.net> USER root -ENV IDP_VERSION 3.3.0 +ENV IDP_VERSION 3.3.1 COPY install.properties /opt/ COPY nordu-ldap.properties /opt/ COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz.sha256 /opt/ -COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz /opt/ COPY templates /opt/templates WORKDIR /opt RUN echo $(id) && apk --no-cache add bash apache-ant curl && \ + curl -o shibboleth-identity-provider-$IDP_VERSION.tar.gz https://shibboleth.net/downloads/identity-provider/$IDP_VERSION/shibboleth-identity-provider-$IDP_VERSION.tar.gz && \ sha256sum -c shibboleth-identity-provider-$IDP_VERSION.tar.gz.sha256 && \ tar xf shibboleth-identity-provider-$IDP_VERSION.tar.gz && \ mv shibboleth-identity-provider-$IDP_VERSION shibboleth-identity-provider && \ diff --git a/idp/shib-entrypoint.sh b/idp/shib-entrypoint.sh index a1dc327..944ea09 100755 --- a/idp/shib-entrypoint.sh +++ b/idp/shib-entrypoint.sh @@ -72,7 +72,7 @@ if [ -f ${DATADIR}/credentials/idp-encryption.key -a -f ${DATADIR}/credentials/i fi # overwrite idp-metadata if present -if [ -f ${DATADIR}/idp-metadata.xml.xml ]; then +if [ -f ${DATADIR}/idp-metadata.xml ]; then cp ${DATADIR}/idp-metadata.xml /opt/shibboleth-idp/metadata/ fi diff --git a/idp/shibboleth-identity-provider-3.3.1.tar.gz.sha256 b/idp/shibboleth-identity-provider-3.3.1.tar.gz.sha256 new file mode 100644 index 0000000..91e7087 --- /dev/null +++ b/idp/shibboleth-identity-provider-3.3.1.tar.gz.sha256 @@ -0,0 +1 @@ +8bd852dcdc7e6729ee645c0374a3c476b152fa24506fb86ffec33dfd190e607c shibboleth-identity-provider-3.3.1.tar.gz |