From eadb0ebe5eb0d1e5fcff88e8322f5e3a44d6c93f Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@nordu.net>
Date: Thu, 9 Apr 2015 18:53:06 +0200
Subject: Added Jetty configuration and start command.

---
 Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 74be2e3..11bee0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ RUN apt-get update && \
     apt-get install -y wget
 
 # Download and install jetty
-ENV JETTY_VERSION 9.2.7
-ENV RELEASE_DATE v20150116
+ENV JETTY_VERSION 9.2.10
+ENV RELEASE_DATE v20150310
 RUN wget http://download.eclipse.org/jetty/stable-9/dist/jetty-distribution-${JETTY_VERSION}.${RELEASE_DATE}.tar.gz && \
     tar -xzvf jetty-distribution-${JETTY_VERSION}.${RELEASE_DATE}.tar.gz && \
     rm -rf jetty-distribution-${JETTY_VERSION}.${RELEASE_DATE}.tar.gz && \
@@ -19,6 +19,14 @@ RUN useradd jetty && \
     chown -R jetty:jetty /opt/jetty && \
     rm -rf /opt/jetty/webapps.demo
 
+# Add configuration files
+ADD jetty_conf /jetty_conf
+RUN mv /jetty_conf/start.ini /opt/jetty/start.ini && \
+    mv /jetty_conf/jetty-ssl.xml /opt/jetty/etc/jetty-ssl.xml && \
+    mv /jetty_conf/jetty-https.xml /opt/jetty/etc/jetty-https.xml && \
+    mv /jetty_conf/ssl.mod /opt/jetty/modules/ssl.mod && \
+    mv /jetty_conf/idp.xml /opt/jetty/webapps/idp.xml
+
 # Download shibboleth-idp
 ENV IDP_VERSION 3.0.0
 RUN wget https://shibboleth.net/downloads/identity-provider/${IDP_VERSION}/shibboleth-identity-provider-${IDP_VERSION}.tar.gz && \
-- 
cgit v1.1