diff options
| author | Markus Krogh <markus@nordu.net> | 2017-09-29 18:09:23 +0200 |
|---|---|---|
| committer | Markus Krogh <markus@nordu.net> | 2017-09-29 18:09:23 +0200 |
| commit | 818063992c86ac7e6f6b085e6d97886a23af5512 (patch) | |
| tree | 418a41f96a9deeeddf1b022473427219db4ffb0b | |
| parent | 35751e3cf89abf69f11dff7f9a3396d8068becc8 (diff) | |
Copy org-conf, remove sqlite
| -rw-r--r-- | idp/Dockerfile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/idp/Dockerfile b/idp/Dockerfile index 908233f..ce4c0a9 100644 --- a/idp/Dockerfile +++ b/idp/Dockerfile @@ -8,21 +8,21 @@ 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 template-config/ /opt/template-config -COPY shibboleth.db.ddl /tmp/ WORKDIR /opt -RUN echo $(id) && apk --no-cache add bash apache-ant sqlite curl && \ +RUN echo $(id) && apk --no-cache add bash apache-ant curl && \ #curl -O 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 && \ ./shibboleth-identity-provider/bin/install.sh -propertyfile install.properties && \ apk --no-cache del apache-ant && \ + cp -a /opt/shibboleth-idp/conf /opt/org-conf && \ cp /opt/template-config/*.xml /opt/shibboleth-idp/conf && \ sed -i '/p:postAuthenticationFlows=/ s/p:postAuthenticationFlows="attribute-release" //' /opt/shibboleth-idp/conf/relying-party.xml && \ rm -rf shibboleth-identity-provider* install.properties nordu-ldap.properties ADD https://mds.swamid.se/md/md-signer2.crt /opt/shibboleth-idp/credentials/ -RUN chown -R jetty:jetty /opt/shibboleth-idp +RUN chown -R jetty:jetty /opt #RUN mkdir -p persistent-id && sqlite3 persistent-id/shibboleth.db < /tmp/shibboleth.db.ddl && rm -f /tmp/shibboleth.db.ddl @@ -31,4 +31,3 @@ COPY shib-entrypoint.sh /shib-entrypoint.sh USER jetty ENTRYPOINT ["/shib-entrypoint.sh"] WORKDIR $JETTY_BASE -CMD ["java","-jar","/usr/local/jetty/start.jar"] |