Skip to content

Commit bd88cc0

Browse files
authored
Merge pull request #155 from wrporter/openjdk-8u151
Update 8-jdk and 8-jre to alpine 3.7 and 8u151
2 parents ceae8e7 + 17d0f9f commit bd88cc0

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

7-jdk/alpine/Dockerfile

Lines changed: 3 additions & 3 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.6
7+
FROM alpine:3.7
88

99
# A few reasons for installing distribution-provided OpenJDK:
1010
#
@@ -31,8 +31,8 @@ RUN { \
3131
ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk
3232
ENV PATH $PATH:/usr/lib/jvm/java-1.7-openjdk/jre/bin:/usr/lib/jvm/java-1.7-openjdk/bin
3333

34-
ENV JAVA_VERSION 7u131
35-
ENV JAVA_ALPINE_VERSION 7.131.2.6.9-r1
34+
ENV JAVA_VERSION 7u151
35+
ENV JAVA_ALPINE_VERSION 7.151.2.6.11-r0
3636

3737
RUN set -x \
3838
&& apk add --no-cache \

7-jre/alpine/Dockerfile

Lines changed: 3 additions & 3 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.6
7+
FROM alpine:3.7
88

99
# A few reasons for installing distribution-provided OpenJDK:
1010
#
@@ -31,8 +31,8 @@ RUN { \
3131
ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk/jre
3232
ENV PATH $PATH:/usr/lib/jvm/java-1.7-openjdk/jre/bin:/usr/lib/jvm/java-1.7-openjdk/bin
3333

34-
ENV JAVA_VERSION 7u131
35-
ENV JAVA_ALPINE_VERSION 7.131.2.6.9-r1
34+
ENV JAVA_VERSION 7u151
35+
ENV JAVA_ALPINE_VERSION 7.151.2.6.11-r0
3636

3737
RUN set -x \
3838
&& apk add --no-cache \

8-jdk/alpine/Dockerfile

Lines changed: 3 additions & 3 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.6
7+
FROM alpine:3.7
88

99
# A few reasons for installing distribution-provided OpenJDK:
1010
#
@@ -31,8 +31,8 @@ RUN { \
3131
ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
3232
ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
3333

34-
ENV JAVA_VERSION 8u131
35-
ENV JAVA_ALPINE_VERSION 8.131.11-r2
34+
ENV JAVA_VERSION 8u151
35+
ENV JAVA_ALPINE_VERSION 8.151.12-r0
3636

3737
RUN set -x \
3838
&& apk add --no-cache \

8-jre/alpine/Dockerfile

Lines changed: 3 additions & 3 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.6
7+
FROM alpine:3.7
88

99
# A few reasons for installing distribution-provided OpenJDK:
1010
#
@@ -31,8 +31,8 @@ RUN { \
3131
ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
3232
ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
3333

34-
ENV JAVA_VERSION 8u131
35-
ENV JAVA_ALPINE_VERSION 8.131.11-r2
34+
ENV JAVA_VERSION 8u151
35+
ENV JAVA_ALPINE_VERSION 8.151.12-r0
3636

3737
RUN set -x \
3838
&& apk add --no-cache \

update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ declare -A suites=(
1616
[9]='sid'
1717
)
1818
declare -A alpineVersions=(
19-
[7]='3.6'
20-
[8]='3.6'
19+
[7]='3.7'
20+
[8]='3.7'
2121
#[9]='TBD' # there is no openjdk9 in Alpine yet (https://pkgs.alpinelinux.org/packages?name=openjdk9*&arch=x86_64)
2222
)
2323

0 commit comments

Comments
 (0)