From 37dbf0917c384321c6c0faa5db00586c4448325f Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 1 Feb 2019 21:52:53 +0100 Subject: [PATCH 1/2] Update some urls to HTTPS --- 11/jdk/oracle/Dockerfile | 4 ++-- 11/jdk/windows/nanoserver-sac2016/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-1709/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-1803/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-ltsc2016/Dockerfile | 2 +- 12/jdk/alpine/Dockerfile | 4 ++-- 12/jdk/oracle/Dockerfile | 4 ++-- 12/jdk/windows/nanoserver-sac2016/Dockerfile | 2 +- 12/jdk/windows/windowsservercore-1709/Dockerfile | 2 +- 12/jdk/windows/windowsservercore-1803/Dockerfile | 2 +- 12/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 12/jdk/windows/windowsservercore-ltsc2016/Dockerfile | 2 +- 13/jdk/alpine/Dockerfile | 4 ++-- 13/jdk/oracle/Dockerfile | 4 ++-- 13/jdk/windows/nanoserver-sac2016/Dockerfile | 2 +- 13/jdk/windows/windowsservercore-1709/Dockerfile | 2 +- 13/jdk/windows/windowsservercore-1803/Dockerfile | 2 +- 13/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 13/jdk/windows/windowsservercore-ltsc2016/Dockerfile | 2 +- Dockerfile-alpine.template | 4 ++-- Dockerfile-oracle.template | 4 ++-- Dockerfile-windows.template | 2 +- generate-stackbrew-library.sh | 2 +- update.sh | 2 +- 25 files changed, 32 insertions(+), 32 deletions(-) diff --git a/11/jdk/oracle/Dockerfile b/11/jdk/oracle/Dockerfile index ae49c6c1..24d386a9 100644 --- a/11/jdk/oracle/Dockerfile +++ b/11/jdk/oracle/Dockerfile @@ -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 @@ -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 diff --git a/11/jdk/windows/nanoserver-sac2016/Dockerfile b/11/jdk/windows/nanoserver-sac2016/Dockerfile index 356fee39..eae9acb0 100644 --- a/11/jdk/windows/nanoserver-sac2016/Dockerfile +++ b/11/jdk/windows/nanoserver-sac2016/Dockerfile @@ -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 diff --git a/11/jdk/windows/windowsservercore-1709/Dockerfile b/11/jdk/windows/windowsservercore-1709/Dockerfile index 77db6b24..4a472208 100644 --- a/11/jdk/windows/windowsservercore-1709/Dockerfile +++ b/11/jdk/windows/windowsservercore-1709/Dockerfile @@ -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 diff --git a/11/jdk/windows/windowsservercore-1803/Dockerfile b/11/jdk/windows/windowsservercore-1803/Dockerfile index e3e3afd7..f4763e0a 100644 --- a/11/jdk/windows/windowsservercore-1803/Dockerfile +++ b/11/jdk/windows/windowsservercore-1803/Dockerfile @@ -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 diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile b/11/jdk/windows/windowsservercore-1809/Dockerfile index 367058c3..92c45fc8 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile @@ -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 diff --git a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile index f07fb707..acd5d5e8 100644 --- a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile +++ b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile @@ -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 diff --git a/12/jdk/alpine/Dockerfile b/12/jdk/alpine/Dockerfile index 36375716..0a28a297 100644 --- a/12/jdk/alpine/Dockerfile +++ b/12/jdk/alpine/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.8 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 @@ -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 diff --git a/12/jdk/oracle/Dockerfile b/12/jdk/oracle/Dockerfile index aff1d821..2a34e5b9 100644 --- a/12/jdk/oracle/Dockerfile +++ b/12/jdk/oracle/Dockerfile @@ -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 @@ -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 diff --git a/12/jdk/windows/nanoserver-sac2016/Dockerfile b/12/jdk/windows/nanoserver-sac2016/Dockerfile index e2a73989..2f47f85f 100644 --- a/12/jdk/windows/nanoserver-sac2016/Dockerfile +++ b/12/jdk/windows/nanoserver-sac2016/Dockerfile @@ -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 diff --git a/12/jdk/windows/windowsservercore-1709/Dockerfile b/12/jdk/windows/windowsservercore-1709/Dockerfile index 1cf17ae3..9350d44e 100644 --- a/12/jdk/windows/windowsservercore-1709/Dockerfile +++ b/12/jdk/windows/windowsservercore-1709/Dockerfile @@ -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 diff --git a/12/jdk/windows/windowsservercore-1803/Dockerfile b/12/jdk/windows/windowsservercore-1803/Dockerfile index 44022097..a77cef3d 100644 --- a/12/jdk/windows/windowsservercore-1803/Dockerfile +++ b/12/jdk/windows/windowsservercore-1803/Dockerfile @@ -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 diff --git a/12/jdk/windows/windowsservercore-1809/Dockerfile b/12/jdk/windows/windowsservercore-1809/Dockerfile index 1bc75d07..49afdd16 100644 --- a/12/jdk/windows/windowsservercore-1809/Dockerfile +++ b/12/jdk/windows/windowsservercore-1809/Dockerfile @@ -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 diff --git a/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile b/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile index 8648482c..09fbe2a7 100644 --- a/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile +++ b/12/jdk/windows/windowsservercore-ltsc2016/Dockerfile @@ -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 diff --git a/13/jdk/alpine/Dockerfile b/13/jdk/alpine/Dockerfile index 7dd495fb..b315897b 100644 --- a/13/jdk/alpine/Dockerfile +++ b/13/jdk/alpine/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.8 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 @@ -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 diff --git a/13/jdk/oracle/Dockerfile b/13/jdk/oracle/Dockerfile index 60661a15..efb1a84e 100644 --- a/13/jdk/oracle/Dockerfile +++ b/13/jdk/oracle/Dockerfile @@ -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 @@ -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 diff --git a/13/jdk/windows/nanoserver-sac2016/Dockerfile b/13/jdk/windows/nanoserver-sac2016/Dockerfile index f256fb21..8fc7bdd4 100644 --- a/13/jdk/windows/nanoserver-sac2016/Dockerfile +++ b/13/jdk/windows/nanoserver-sac2016/Dockerfile @@ -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 diff --git a/13/jdk/windows/windowsservercore-1709/Dockerfile b/13/jdk/windows/windowsservercore-1709/Dockerfile index 436f97e0..0567d05a 100644 --- a/13/jdk/windows/windowsservercore-1709/Dockerfile +++ b/13/jdk/windows/windowsservercore-1709/Dockerfile @@ -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 diff --git a/13/jdk/windows/windowsservercore-1803/Dockerfile b/13/jdk/windows/windowsservercore-1803/Dockerfile index 77bbe2eb..b3bc72ca 100644 --- a/13/jdk/windows/windowsservercore-1803/Dockerfile +++ b/13/jdk/windows/windowsservercore-1803/Dockerfile @@ -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 diff --git a/13/jdk/windows/windowsservercore-1809/Dockerfile b/13/jdk/windows/windowsservercore-1809/Dockerfile index 3f097525..f049eee6 100644 --- a/13/jdk/windows/windowsservercore-1809/Dockerfile +++ b/13/jdk/windows/windowsservercore-1809/Dockerfile @@ -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 diff --git a/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile b/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile index fccc89a0..81226685 100644 --- a/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile +++ b/13/jdk/windows/windowsservercore-ltsc2016/Dockerfile @@ -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 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 7387044a..7bed8eb1 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -3,7 +3,7 @@ FROM alpine:3.8 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 @@ -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 diff --git a/Dockerfile-oracle.template b/Dockerfile-oracle.template index 071db96c..adec73f0 100644 --- a/Dockerfile-oracle.template +++ b/Dockerfile-oracle.template @@ -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 @@ -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 diff --git a/Dockerfile-windows.template b/Dockerfile-windows.template index 21da1ef6..b82db444 100644 --- a/Dockerfile-windows.template +++ b/Dockerfile-windows.template @@ -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 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index cbd3306a..e66bf174 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -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' ;; diff --git a/update.sh b/update.sh index 3d3f8ea3..291726d5 100755 --- a/update.sh +++ b/update.sh @@ -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" } From d93be18f4f2d5e8457169cac00e559d953b6028e Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 1 Feb 2019 21:53:16 +0100 Subject: [PATCH 2/2] Update to Alpine 3.9 --- 12/jdk/alpine/Dockerfile | 2 +- 13/jdk/alpine/Dockerfile | 2 +- 7/jdk/alpine/Dockerfile | 4 ++-- 7/jre/alpine/Dockerfile | 4 ++-- 8/jdk/alpine/Dockerfile | 2 +- 8/jre/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- update.sh | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/jdk/alpine/Dockerfile b/12/jdk/alpine/Dockerfile index 0a28a297..950321f3 100644 --- a/12/jdk/alpine/Dockerfile +++ b/12/jdk/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.9 ENV JAVA_HOME /opt/openjdk-12 ENV PATH $JAVA_HOME/bin:$PATH diff --git a/13/jdk/alpine/Dockerfile b/13/jdk/alpine/Dockerfile index b315897b..71e90c98 100644 --- a/13/jdk/alpine/Dockerfile +++ b/13/jdk/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.9 ENV JAVA_HOME /opt/openjdk-13 ENV PATH $JAVA_HOME/bin:$PATH diff --git a/7/jdk/alpine/Dockerfile b/7/jdk/alpine/Dockerfile index 9e61ca0f..17084122 100644 --- a/7/jdk/alpine/Dockerfile +++ b/7/jdk/alpine/Dockerfile @@ -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: # @@ -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 \ diff --git a/7/jre/alpine/Dockerfile b/7/jre/alpine/Dockerfile index a958ad2d..70f54717 100644 --- a/7/jre/alpine/Dockerfile +++ b/7/jre/alpine/Dockerfile @@ -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: # @@ -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 \ diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile index 4ad2d915..2fecd634 100644 --- a/8/jdk/alpine/Dockerfile +++ b/8/jdk/alpine/Dockerfile @@ -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: # diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile index daa752cf..e63c046e 100644 --- a/8/jre/alpine/Dockerfile +++ b/8/jre/alpine/Dockerfile @@ -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: # diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 7bed8eb1..48efd6eb 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.9 ENV JAVA_HOME placeholder ENV PATH $JAVA_HOME/bin:$PATH diff --git a/update.sh b/update.sh index 291726d5..ae0b6866 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ declare -A suites=( [8]='stretch' [11]='stretch' ) -defaultAlpineVersion='3.8' +defaultAlpineVersion='3.9' declare -A alpineVersions=( #[8]='3.7' )