From 35751e3cf89abf69f11dff7f9a3396d8068becc8 Mon Sep 17 00:00:00 2001 From: Markus Krogh Date: Fri, 29 Sep 2017 17:42:03 +0200 Subject: Use ENV for persistentiId, logging --- idp/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'idp/Dockerfile') 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 +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"] -- cgit v1.1