Skip to content

Commit 9089afd

Browse files
authored
Merge pull request #91 from PeterDaveHelloKitchen/alpine-3.5
Upgrade alpine to v3.5
2 parents e2c8648 + a2b245f commit 9089afd

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

7-jdk/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.5
88

99
# A few problems with compiling Java from source:
1010
# 1. Oracle. Licensing prevents us from redistributing the official JDK.

7-jre/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.5
88

99
# A few problems with compiling Java from source:
1010
# 1. Oracle. Licensing prevents us from redistributing the official JDK.

8-jdk/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.5
88

99
# A few problems with compiling Java from source:
1010
# 1. Oracle. Licensing prevents us from redistributing the official JDK.
@@ -27,7 +27,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
2727
ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
2828

2929
ENV JAVA_VERSION 8u111
30-
ENV JAVA_ALPINE_VERSION 8.111.14-r0
30+
ENV JAVA_ALPINE_VERSION 8.111.14-r1
3131

3232
RUN set -x \
3333
&& apk add --no-cache \

8-jre/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.5
88

99
# A few problems with compiling Java from source:
1010
# 1. Oracle. Licensing prevents us from redistributing the official JDK.
@@ -27,7 +27,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
2727
ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
2828

2929
ENV JAVA_VERSION 8u111
30-
ENV JAVA_ALPINE_VERSION 8.111.14-r0
30+
ENV JAVA_ALPINE_VERSION 8.111.14-r1
3131

3232
RUN set -x \
3333
&& apk add --no-cache \

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ declare -A variants=(
2626
[jdk]='scm'
2727
)
2828

29-
alpineVersion='3.4'
29+
alpineVersion='3.5'
3030
alpineMirror="http://dl-cdn.alpinelinux.org/alpine/v${alpineVersion}/community/x86_64"
3131
curl -fsSL'#' "$alpineMirror/APKINDEX.tar.gz" | tar -zxv APKINDEX
3232

0 commit comments

Comments
 (0)