summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-05-18 12:22:53 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-05-18 12:22:53 +0200
commitd62ee39125b5ca95f06ee76c9a5bc497b84cec6a (patch)
tree85ec1c337215931d23b483295b12f8c8decf5271
parent51a20d87200cd219409fce5b30d32cf38f616e73 (diff)
Switched oracle java for openjdk due to docker registry changes.
-rw-r--r--Dockerfile2
-rw-r--r--start.sh1
2 files changed, 2 insertions, 1 deletions
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}