# HG changeset patch
# User smith@nwoca.org
# Date 1493321580 14400
# Node ID a113282d940056fbb5b5a92e73a3a31755dbc953
# Parent  40d81a3dd3cc3b62204405747f8f8a6f2dfeee94
DEP-12: update java version and fix ms fonts installer

diff -r 40d81a3dd3cc -r a113282d9400 java/Dockerfile
--- a/java/Dockerfile	Mon Apr 24 16:10:57 2017 +0100
+++ b/java/Dockerfile	Thu Apr 27 15:33:00 2017 -0400
@@ -1,11 +1,15 @@
-FROM docker.ssdt.io/java:8-jre
+FROM openjdk:8u121-jdk
 
 MAINTAINER Dave Smith <smith@nwoca.org>
 
-RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections \
-	&& echo 'deb http://httpredir.debian.org/debian jessie contrib' > /etc/apt/sources.list.d/jessie-contrib.list \
-    && apt-get update 									\
-    && apt-get install -y ttf-mscorefonts-installer
+RUN echo "deb http://httpredir.debian.org/debian jessie main contrib" > /etc/apt/sources.list \
+    && echo "deb http://security.debian.org/ jessie/updates main contrib" >> /etc/apt/sources.list \
+    && echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections \
+    && apt-get update \
+    && apt-get install -y ttf-mscorefonts-installer \
+    && apt-get clean \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV TZ=America/New_York