From 8d80a82bb2a2bb895beffebe28ef221e36449446 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 11 Jan 2016 18:22:23 +0100
Subject: [PATCH 1/4] add java:openjdk-8-jre-alpine

---
 openjdk-8-jre/alpine/Dockerfile | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 openjdk-8-jre/alpine/Dockerfile

diff --git a/openjdk-8-jre/alpine/Dockerfile b/openjdk-8-jre/alpine/Dockerfile
new file mode 100644
index 00000000..21c5b6dd
--- /dev/null
+++ b/openjdk-8-jre/alpine/Dockerfile
@@ -0,0 +1,28 @@
+FROM alpine:3.3
+
+# A few problems with compiling Java from source:
+#  1. Oracle.  Licensing prevents us from redistributing the official JDK.
+#  2. Compiling OpenJDK also requires the JDK to be installed, and it gets
+#       really hairy.
+
+# Default to UTF-8 file.encoding
+ENV LANG C.UTF-8
+
+# add a simple script that can auto-detect the appropriate JAVA_HOME value
+# based on whether the JDK or only the JRE is installed
+RUN { \
+		echo '#!/bin/sh -e'; \
+		echo; \
+		echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
+	} > /usr/local/bin/docker-java-home \
+	&& chmod +x /usr/local/bin/docker-java-home
+
+ENV JAVA_VERSION 8u72
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
+
+RUN set -x \
+	&& apk add --no-cache \
+		"openjdk8>=${JAVA_VERSION/u/.}" \
+		ca-certificates \
+	&& [ "$JAVA_HOME" = "$(docker-java-home)" ]
+

From 2b59d89bfa05b13f397b7e30562d6ab6ca177da0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 14 Jan 2016 17:06:10 +0100
Subject: [PATCH 2/4] add java:openjdk-8-jdk-alpine

---
 openjdk-8-jdk/alpine/Dockerfile | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 openjdk-8-jdk/alpine/Dockerfile

diff --git a/openjdk-8-jdk/alpine/Dockerfile b/openjdk-8-jdk/alpine/Dockerfile
new file mode 100644
index 00000000..884fda25
--- /dev/null
+++ b/openjdk-8-jdk/alpine/Dockerfile
@@ -0,0 +1,29 @@
+FROM alpine:3.3
+
+# A few problems with compiling Java from source:
+#  1. Oracle.  Licensing prevents us from redistributing the official JDK.
+#  2. Compiling OpenJDK also requires the JDK to be installed, and it gets
+#       really hairy.
+
+# Default to UTF-8 file.encoding
+ENV LANG C.UTF-8
+
+# add a simple script that can auto-detect the appropriate JAVA_HOME value
+# based on whether the JDK or only the JRE is installed
+RUN { \
+		echo '#!/bin/sh -e'; \
+		echo; \
+		echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
+	} > /usr/local/bin/docker-java-home \
+	&& chmod +x /usr/local/bin/docker-java-home
+
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+
+ENV JAVA_VERSION 8u72
+ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/bin
+
+RUN set -x \
+	&& apk add --no-cache \
+		"openjdk8>=${JAVA_VERSION/u/.}" \
+		ca-certificates \
+	&& [ "$JAVA_HOME" = "$(docker-java-home)" ]

From 54de1039b62a991ca6a53ba9aec6717383b37136 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 14 Jan 2016 17:14:26 +0100
Subject: [PATCH 3/4] add alpine variants to travis

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f900bbf..d741fd87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ services: docker
 env:
   - VERSION=openjdk-9-jre
   - VERSION=openjdk-9-jdk
+  - VERSION=openjdk-8-jre VARIANT=alpine
+  - VERSION=openjdk-8-jdk VARIANT=alpine
   - VERSION=openjdk-8-jre
   - VERSION=openjdk-8-jdk
   - VERSION=openjdk-7-jre
@@ -16,8 +18,8 @@ install:
 
 before_script:
   - env | sort
-  - cd "$VERSION"
-  - image="java:$VERSION"
+  - cd "${VERSION}${VARIANT:+-$VARIANT}"
+  - image="java:${VERSION}${VARIANT:+-$VARIANT}"
 
 script:
   - docker build -t "$image" .

From 7f7959fe63a3555a5545f92e5c6a3073702094bb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 10 Mar 2016 15:53:42 +0100
Subject: [PATCH 4/4] fix variants in travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d741fd87..22a2e83f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
 
 before_script:
   - env | sort
-  - cd "${VERSION}${VARIANT:+-$VARIANT}"
+  - cd "${VERSION}${VARIANT:+/$VARIANT}"
   - image="java:${VERSION}${VARIANT:+-$VARIANT}"
 
 script: