Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 11/jdk/oracle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN set -eux; \
ENV JAVA_HOME /usr/java/openjdk-11
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 11.0.2
ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz
ENV JAVA_SHA256 99be79935354f5c0df1ad293620ea36d13f48ec3ea870c838f20c504c9668b57
Expand All @@ -41,7 +41,7 @@ RUN set -eux; \
done; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/nanoserver-sac2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 11.0.2
ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
ENV JAVA_SHA256 cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/windowsservercore-1709/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 11.0.2
ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
ENV JAVA_SHA256 cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/windowsservercore-1803/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 11.0.2
ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
ENV JAVA_SHA256 cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 11.0.2
ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
ENV JAVA_SHA256 cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/windows/windowsservercore-ltsc2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 11.0.2
ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
ENV JAVA_SHA256 cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8
Expand Down
6 changes: 3 additions & 3 deletions 12/jdk/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.8
FROM alpine:3.9

ENV JAVA_HOME /opt/openjdk-12
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+29
ENV JAVA_URL https://download.java.net/java/early_access/alpine/29/binaries/openjdk-12-ea+29_linux-x64-musl_bin.tar.gz
ENV JAVA_SHA256 39c22481736ae8a054fc820ad0cc3f1d9ad3f3f00d8111775573fe6d04c18bf5
Expand All @@ -18,7 +18,7 @@ RUN set -eux; \
rm /openjdk.tgz; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
4 changes: 2 additions & 2 deletions 12/jdk/oracle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN set -eux; \
ENV JAVA_HOME /usr/java/openjdk-12
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+30
ENV JAVA_URL https://download.java.net/java/early_access/jdk12/30/GPL/openjdk-12-ea+30_linux-x64_bin.tar.gz
ENV JAVA_SHA256 edfd94e15194dbaa5f08b995ee98309f9b8bb97a59b232be4e590c4954f4c859
Expand All @@ -41,7 +41,7 @@ RUN set -eux; \
done; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/windows/nanoserver-sac2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+30
ENV JAVA_URL https://download.java.net/java/early_access/jdk12/30/GPL/openjdk-12-ea+30_windows-x64_bin.zip
ENV JAVA_SHA256 c2aa69aed6fa14de46b2f0b21bc9ad0157220a3e8e13fbf47b9c9bde2aff5121
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/windows/windowsservercore-1709/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+30
ENV JAVA_URL https://download.java.net/java/early_access/jdk12/30/GPL/openjdk-12-ea+30_windows-x64_bin.zip
ENV JAVA_SHA256 c2aa69aed6fa14de46b2f0b21bc9ad0157220a3e8e13fbf47b9c9bde2aff5121
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/windows/windowsservercore-1803/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+30
ENV JAVA_URL https://download.java.net/java/early_access/jdk12/30/GPL/openjdk-12-ea+30_windows-x64_bin.zip
ENV JAVA_SHA256 c2aa69aed6fa14de46b2f0b21bc9ad0157220a3e8e13fbf47b9c9bde2aff5121
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/windows/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+30
ENV JAVA_URL https://download.java.net/java/early_access/jdk12/30/GPL/openjdk-12-ea+30_windows-x64_bin.zip
ENV JAVA_SHA256 c2aa69aed6fa14de46b2f0b21bc9ad0157220a3e8e13fbf47b9c9bde2aff5121
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/windows/windowsservercore-ltsc2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 12-ea+30
ENV JAVA_URL https://download.java.net/java/early_access/jdk12/30/GPL/openjdk-12-ea+30_windows-x64_bin.zip
ENV JAVA_SHA256 c2aa69aed6fa14de46b2f0b21bc9ad0157220a3e8e13fbf47b9c9bde2aff5121
Expand Down
6 changes: 3 additions & 3 deletions 13/jdk/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.8
FROM alpine:3.9

ENV JAVA_HOME /opt/openjdk-13
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+5
ENV JAVA_URL https://download.java.net/java/early_access/alpine/5/binaries/openjdk-13-ea+5_linux-x64-musl_bin.tar.gz
ENV JAVA_SHA256 277c4238ac2c7c8e1d331ff87f851fefe051c9503e3e030fbdaec40dbff89529
Expand All @@ -18,7 +18,7 @@ RUN set -eux; \
rm /openjdk.tgz; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
4 changes: 2 additions & 2 deletions 13/jdk/oracle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN set -eux; \
ENV JAVA_HOME /usr/java/openjdk-13
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+6
ENV JAVA_URL https://download.java.net/java/early_access/jdk13/6/GPL/openjdk-13-ea+6_linux-x64_bin.tar.gz
ENV JAVA_SHA256 c746b087d3401b85b705c8073533bdd338e4d61780107ec2b3be1803ffcdbc26
Expand All @@ -41,7 +41,7 @@ RUN set -eux; \
done; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/windows/nanoserver-sac2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+6
ENV JAVA_URL https://download.java.net/java/early_access/jdk13/6/GPL/openjdk-13-ea+6_windows-x64_bin.zip
ENV JAVA_SHA256 4fbf1dde0aff9c0b2252922a6a27cb6b0c9bd35e454af1962be196ab081d05df
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/windows/windowsservercore-1709/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+6
ENV JAVA_URL https://download.java.net/java/early_access/jdk13/6/GPL/openjdk-13-ea+6_windows-x64_bin.zip
ENV JAVA_SHA256 4fbf1dde0aff9c0b2252922a6a27cb6b0c9bd35e454af1962be196ab081d05df
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/windows/windowsservercore-1803/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+6
ENV JAVA_URL https://download.java.net/java/early_access/jdk13/6/GPL/openjdk-13-ea+6_windows-x64_bin.zip
ENV JAVA_SHA256 4fbf1dde0aff9c0b2252922a6a27cb6b0c9bd35e454af1962be196ab081d05df
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/windows/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+6
ENV JAVA_URL https://download.java.net/java/early_access/jdk13/6/GPL/openjdk-13-ea+6_windows-x64_bin.zip
ENV JAVA_SHA256 4fbf1dde0aff9c0b2252922a6a27cb6b0c9bd35e454af1962be196ab081d05df
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/windows/windowsservercore-ltsc2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION 13-ea+6
ENV JAVA_URL https://download.java.net/java/early_access/jdk13/6/GPL/openjdk-13-ea+6_windows-x64_bin.zip
ENV JAVA_SHA256 4fbf1dde0aff9c0b2252922a6a27cb6b0c9bd35e454af1962be196ab081d05df
Expand Down
4 changes: 2 additions & 2 deletions 7/jdk/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM alpine:3.8
FROM alpine:3.9

# A few reasons for installing distribution-provided OpenJDK:
#
Expand Down Expand Up @@ -32,7 +32,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk
ENV PATH $PATH:/usr/lib/jvm/java-1.7-openjdk/jre/bin:/usr/lib/jvm/java-1.7-openjdk/bin

ENV JAVA_VERSION 7u181
ENV JAVA_ALPINE_VERSION 7.181.2.6.14-r0
ENV JAVA_ALPINE_VERSION 7.181.2.6.14-r2

RUN set -x \
&& apk add --no-cache \
Expand Down
4 changes: 2 additions & 2 deletions 7/jre/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM alpine:3.8
FROM alpine:3.9

# A few reasons for installing distribution-provided OpenJDK:
#
Expand Down Expand Up @@ -32,7 +32,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk/jre
ENV PATH $PATH:/usr/lib/jvm/java-1.7-openjdk/jre/bin:/usr/lib/jvm/java-1.7-openjdk/bin

ENV JAVA_VERSION 7u181
ENV JAVA_ALPINE_VERSION 7.181.2.6.14-r0
ENV JAVA_ALPINE_VERSION 7.181.2.6.14-r2

RUN set -x \
&& apk add --no-cache \
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM alpine:3.8
FROM alpine:3.9

# A few reasons for installing distribution-provided OpenJDK:
#
Expand Down
2 changes: 1 addition & 1 deletion 8/jre/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM alpine:3.8
FROM alpine:3.9

# A few reasons for installing distribution-provided OpenJDK:
#
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile-alpine.template
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.8
FROM alpine:3.9

ENV JAVA_HOME placeholder
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION placeholder
ENV JAVA_URL placeholder
ENV JAVA_SHA256 placeholder
Expand All @@ -18,7 +18,7 @@ RUN set -eux; \
rm /openjdk.tgz; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-oracle.template
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN set -eux; \
ENV JAVA_HOME placeholder
ENV PATH $JAVA_HOME/bin:$PATH

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION placeholder
ENV JAVA_URL placeholder
ENV JAVA_SHA256 placeholder
Expand All @@ -41,7 +41,7 @@ RUN set -eux; \
done; \
\
# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
# http://openjdk.java.net/jeps/341
# https://openjdk.java.net/jeps/341
java -Xshare:dump; \
\
# basic smoke test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-windows.template
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
# Nano Server does not have "[Environment]::SetEnvironmentVariable()"
setx /M PATH $newPath

# http://jdk.java.net/
# https://jdk.java.net/
ENV JAVA_VERSION placeholder
ENV JAVA_URL placeholder
ENV JAVA_SHA256 placeholder
Expand Down
2 changes: 1 addition & 1 deletion generate-stackbrew-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ for javaVersion in "${versions[@]}"; do

variantArches=
if [ "$javaVersion" -ge 10 ]; then
# http://jdk.java.net/10/, http://jdk.java.net/11/, http://jdk.java.net/12/, ...
# https://jdk.java.net/10/, https://jdk.java.net/11/, https://jdk.java.net/12/, ...
# (no arches except amd64 supported)
case "$v" in
oracle|alpine) variantArches='amd64' ;;
Expand Down
4 changes: 2 additions & 2 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ declare -A suites=(
[8]='stretch'
[11]='stretch'
)
defaultAlpineVersion='3.8'
defaultAlpineVersion='3.9'
declare -A alpineVersions=(
#[8]='3.7'
)
Expand Down Expand Up @@ -163,7 +163,7 @@ template-contribute-footer() {
jdk-java-net-download-url() {
local javaVersion="$1"; shift
local fileSuffix="$1"; shift
wget -qO- "http://jdk.java.net/$javaVersion/" \
wget -qO- "https://jdk.java.net/$javaVersion/" \
| tac|tac \
| grep -Eom1 "https://download.java.net/[^\"]+$fileSuffix"
}
Expand Down