From 55e5d196d27a18c573c26a86b1b035eae0e747b4 Mon Sep 17 00:00:00 2001
From: Kyle Manna <kyle@kylemanna.com>
Date: Tue, 11 Nov 2014 21:00:30 -0800
Subject: [PATCH] Dockerfile: Use Oracle Java instead of OpenJDK

* Android complains otherwise.  It's apparenty there will need to be
  multiple docker versions with different JDKs for different Android
  builds.
---
 Dockerfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4807210..7ea6d18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,19 @@ FROM ubuntu:14.04
 
 MAINTAINER Kyle Manna <kyle@kylemanna.com>
 
+# Setup for Java
+RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" \
+        >> /etc/apt/sources.list.d/webupd8.list && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886 && \
+    echo oracle-java6-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
+
 # Keep the dependency list as short as reasonable
 RUN apt-get update && \
     apt-get install -y bison bsdmainutils build-essential curl \
         flex g++-multilib gcc-multilib git gnupg gperf lib32ncurses5-dev \
         lib32readline-gplv2-dev lib32z1-dev libesd0-dev libncurses5-dev \
-        libsdl1.2-dev libwxgtk2.8-dev libxml2-utils lzop openjdk-6-jdk \
+        libsdl1.2-dev libwxgtk2.8-dev libxml2-utils lzop \
+        oracle-java6-installer oracle-java6-set-default \
         pngcrush schedtool xsltproc zip zlib1g-dev && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*