From d62ee39125b5ca95f06ee76c9a5bc497b84cec6a Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@nordu.net>
Date: Mon, 18 May 2015 12:22:53 +0200
Subject: Switched oracle java for openjdk due to docker registry changes.

---
 Dockerfile | 2 +-
 start.sh   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7b5902f..e6fc288 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM dockerfile/java:oracle-java7
+FROM java:7
 MAINTAINER Johan Lundberg <lundberg@nordu.net>
 
 # Install packages
diff --git a/start.sh b/start.sh
index 5d5a879..dc0f58a 100644
--- a/start.sh
+++ b/start.sh
@@ -1,4 +1,5 @@
 #!/bin/sh -x
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
 
 # shibboleth-identity-provider source dir
 cd /opt/shibboleth-identity-provider-${IDP_VERSION}
-- 
cgit v1.1