From ff743a24f280268a98839a913d51712a66e4b321 Mon Sep 17 00:00:00 2001
From: Jesper Brix Rosenkilde <jbr@nordu.net>
Date: Thu, 6 Jul 2017 15:46:41 +0200
Subject: Stop using stupid merge and allow run as jetty user

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index e626534..c8ec340 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ MAINTAINER Jesper B. Rosenkilde <jbr@nordu.net>
 
 ENV IDP_VERSION 3.3.0
 COPY install.properties /opt/
-COPY secrets.properties /opt/
 COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz.sha256 /opt/
 COPY shibboleth.db.ddl /tmp/
 WORKDIR /opt
@@ -17,6 +16,8 @@ RUN apk --no-cache add bash apache-ant sqlite curl && \
     apk --no-cache del apache-ant && \
     rm -rf shibboleth-identity-provider* install.properties
 
+RUN chown -R jetty:jetty /opt/shibboleth-idp
+
 
 #RUN mkdir -p persistent-id && sqlite3 persistent-id/shibboleth.db < /tmp/shibboleth.db.ddl && rm -f /tmp/shibboleth.db.ddl
 
-- 
cgit v1.1