From fd4ce4b1cd4188dc7803afdedda8a6f97f16b605 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 29 Dec 2016 00:08:48 +0800 Subject: [PATCH 1/2] Upgrade alpine to v3.5 --- 7-jdk/alpine/Dockerfile | 2 +- 7-jre/alpine/Dockerfile | 2 +- 8-jdk/alpine/Dockerfile | 2 +- 8-jre/alpine/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/7-jdk/alpine/Dockerfile b/7-jdk/alpine/Dockerfile index c35f2620..772d05c1 100644 --- a/7-jdk/alpine/Dockerfile +++ b/7-jdk/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM alpine:3.5 # A few problems with compiling Java from source: # 1. Oracle. Licensing prevents us from redistributing the official JDK. diff --git a/7-jre/alpine/Dockerfile b/7-jre/alpine/Dockerfile index 492ee896..8188cdea 100644 --- a/7-jre/alpine/Dockerfile +++ b/7-jre/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM alpine:3.5 # A few problems with compiling Java from source: # 1. Oracle. Licensing prevents us from redistributing the official JDK. diff --git a/8-jdk/alpine/Dockerfile b/8-jdk/alpine/Dockerfile index b4f40888..75f62bb2 100644 --- a/8-jdk/alpine/Dockerfile +++ b/8-jdk/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM alpine:3.5 # A few problems with compiling Java from source: # 1. Oracle. Licensing prevents us from redistributing the official JDK. diff --git a/8-jre/alpine/Dockerfile b/8-jre/alpine/Dockerfile index c4d75bc4..165b12bb 100644 --- a/8-jre/alpine/Dockerfile +++ b/8-jre/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM alpine:3.5 # A few problems with compiling Java from source: # 1. Oracle. Licensing prevents us from redistributing the official JDK. From a2b245fc1ab64df2de145b87e631b5e89ca67388 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 3 Jan 2017 15:53:42 -0800 Subject: [PATCH 2/2] Update "alpineVersion" in "update.sh" (and run it) --- 8-jdk/alpine/Dockerfile | 2 +- 8-jre/alpine/Dockerfile | 2 +- update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/8-jdk/alpine/Dockerfile b/8-jdk/alpine/Dockerfile index 75f62bb2..e5db7968 100644 --- a/8-jdk/alpine/Dockerfile +++ b/8-jdk/alpine/Dockerfile @@ -27,7 +27,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin ENV JAVA_VERSION 8u111 -ENV JAVA_ALPINE_VERSION 8.111.14-r0 +ENV JAVA_ALPINE_VERSION 8.111.14-r1 RUN set -x \ && apk add --no-cache \ diff --git a/8-jre/alpine/Dockerfile b/8-jre/alpine/Dockerfile index 165b12bb..e2595eb8 100644 --- a/8-jre/alpine/Dockerfile +++ b/8-jre/alpine/Dockerfile @@ -27,7 +27,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin ENV JAVA_VERSION 8u111 -ENV JAVA_ALPINE_VERSION 8.111.14-r0 +ENV JAVA_ALPINE_VERSION 8.111.14-r1 RUN set -x \ && apk add --no-cache \ diff --git a/update.sh b/update.sh index 22fae971..485c66b3 100755 --- a/update.sh +++ b/update.sh @@ -26,7 +26,7 @@ declare -A variants=( [jdk]='scm' ) -alpineVersion='3.4' +alpineVersion='3.5' alpineMirror="http://dl-cdn.alpinelinux.org/alpine/v${alpineVersion}/community/x86_64" curl -fsSL'#' "$alpineMirror/APKINDEX.tar.gz" | tar -zxv APKINDEX