diff options
| author | Markus Krogh <markus@nordu.net> | 2017-09-29 17:42:03 +0200 |
|---|---|---|
| committer | Markus Krogh <markus@nordu.net> | 2017-09-29 17:42:03 +0200 |
| commit | 35751e3cf89abf69f11dff7f9a3396d8068becc8 (patch) | |
| tree | 9f20b007e8e787ea1a5345c2b7200018a2727a59 /idp/Dockerfile | |
| parent | af0294d5f773bc071128b1ec1712c62f587c7b0a (diff) | |
Use ENV for persistentiId, logging
Diffstat (limited to 'idp/Dockerfile')
| -rw-r--r-- | idp/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/idp/Dockerfile b/idp/Dockerfile index 3dd2d6c..908233f 100644 --- a/idp/Dockerfile +++ b/idp/Dockerfile @@ -1,7 +1,7 @@ FROM jetty:9-alpine -EXPOSE 80 443 MAINTAINER Jesper B. Rosenkilde <jbr@nordu.net> +USER root ENV IDP_VERSION 3.3.0 COPY install.properties /opt/ COPY nordu-ldap.properties /opt/ @@ -10,7 +10,7 @@ COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz /opt/ COPY template-config/ /opt/template-config COPY shibboleth.db.ddl /tmp/ WORKDIR /opt -RUN apk --no-cache add bash apache-ant sqlite curl && \ +RUN echo $(id) && apk --no-cache add bash apache-ant sqlite 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 && \ @@ -28,5 +28,7 @@ RUN chown -R jetty:jetty /opt/shibboleth-idp COPY jetty_base $JETTY_BASE COPY shib-entrypoint.sh /shib-entrypoint.sh -ENTRYPOINT /shib-entrypoint.sh +USER jetty +ENTRYPOINT ["/shib-entrypoint.sh"] WORKDIR $JETTY_BASE +CMD ["java","-jar","/usr/local/jetty/start.jar"] |