From 6b13b6c797b498c96d73b74a4930af9a5132bab4 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 28 Apr 2021 09:35:25 +0100 Subject: [PATCH] add April PSU updates --- 11/jdk/alpine/Dockerfile.hotspot.nightly.full | 20 +------ 11/jdk/alpine/Dockerfile.hotspot.nightly.slim | 20 +------ .../alpine/Dockerfile.hotspot.releases.full | 6 +- .../alpine/Dockerfile.hotspot.releases.slim | 6 +- 11/jdk/alpine/Dockerfile.openj9.nightly.full | 16 +----- 11/jdk/alpine/Dockerfile.openj9.nightly.slim | 16 +----- 11/jdk/alpine/Dockerfile.openj9.releases.full | 6 +- 11/jdk/alpine/Dockerfile.openj9.releases.slim | 6 +- 11/jdk/alpine/slim-java.sh | 5 +- 11/jdk/centos/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jdk/centos/Dockerfile.hotspot.nightly.slim | 20 +++---- .../centos/Dockerfile.hotspot.releases.full | 18 +++--- .../centos/Dockerfile.hotspot.releases.slim | 18 +++--- 11/jdk/centos/Dockerfile.openj9.nightly.full | 16 ++---- 11/jdk/centos/Dockerfile.openj9.nightly.slim | 16 ++---- 11/jdk/centos/Dockerfile.openj9.releases.full | 10 ++-- 11/jdk/centos/Dockerfile.openj9.releases.slim | 10 ++-- 11/jdk/centos/slim-java.sh | 5 +- 11/jdk/clefos/Dockerfile.hotspot.nightly.full | 20 +------ 11/jdk/clefos/Dockerfile.hotspot.nightly.slim | 20 +------ .../clefos/Dockerfile.hotspot.releases.full | 6 +- .../clefos/Dockerfile.hotspot.releases.slim | 6 +- 11/jdk/clefos/Dockerfile.openj9.nightly.full | 16 +----- 11/jdk/clefos/Dockerfile.openj9.nightly.slim | 16 +----- 11/jdk/clefos/Dockerfile.openj9.releases.full | 6 +- 11/jdk/clefos/Dockerfile.openj9.releases.slim | 6 +- 11/jdk/clefos/slim-java.sh | 5 +- 11/jdk/debian/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jdk/debian/Dockerfile.hotspot.nightly.slim | 20 +++---- .../debian/Dockerfile.hotspot.releases.full | 22 ++++---- .../debian/Dockerfile.hotspot.releases.slim | 22 ++++---- 11/jdk/debian/Dockerfile.openj9.nightly.full | 16 ++---- 11/jdk/debian/Dockerfile.openj9.nightly.slim | 16 ++---- 11/jdk/debian/Dockerfile.openj9.releases.full | 14 ++--- 11/jdk/debian/Dockerfile.openj9.releases.slim | 14 ++--- 11/jdk/debian/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.nightly.slim | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../Dockerfile.hotspot.releases.slim | 22 ++++---- .../debianslim/Dockerfile.openj9.nightly.full | 16 ++---- .../debianslim/Dockerfile.openj9.nightly.slim | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.openj9.releases.slim | 14 ++--- 11/jdk/debianslim/slim-java.sh | 5 +- 11/jdk/leap/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jdk/leap/Dockerfile.hotspot.releases.full | 18 +++--- 11/jdk/leap/Dockerfile.openj9.nightly.full | 16 ++---- 11/jdk/leap/Dockerfile.openj9.releases.full | 10 ++-- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../tumbleweed/Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 16 +++--- 11/jdk/ubi/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jdk/ubi/Dockerfile.hotspot.nightly.slim | 20 +++---- 11/jdk/ubi/Dockerfile.hotspot.releases.full | 20 +++---- 11/jdk/ubi/Dockerfile.hotspot.releases.slim | 20 +++---- 11/jdk/ubi/Dockerfile.openj9.nightly.full | 16 ++---- 11/jdk/ubi/Dockerfile.openj9.nightly.slim | 16 ++---- 11/jdk/ubi/Dockerfile.openj9.releases.full | 16 +++--- 11/jdk/ubi/Dockerfile.openj9.releases.slim | 16 +++--- 11/jdk/ubi/slim-java.sh | 5 +- 11/jdk/ubuntu/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim | 20 +++---- .../ubuntu/Dockerfile.hotspot.releases.full | 22 ++++---- .../ubuntu/Dockerfile.hotspot.releases.slim | 22 ++++---- 11/jdk/ubuntu/Dockerfile.openj9.nightly.full | 16 ++---- 11/jdk/ubuntu/Dockerfile.openj9.nightly.slim | 16 ++---- 11/jdk/ubuntu/Dockerfile.openj9.releases.full | 14 ++--- 11/jdk/ubuntu/Dockerfile.openj9.releases.slim | 14 ++--- 11/jdk/ubuntu/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.hotspot.nightly.slim | 34 +++++------ .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.openj9.nightly.slim | 36 ++++++------ 11/jdk/windows/nanoserver-1809/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.hotspot.nightly.slim | 34 +++++------ .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.openj9.nightly.slim | 36 ++++++------ 11/jdk/windows/nanoserver-1909/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 53 ++++++++++++++++++ .../Dockerfile.openj9.nightly.full | 54 ++++++++++++++++++ .../Dockerfile.openj9.nightly.slim | 54 ++++++++++++++++++ 11/jdk/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- 11/jre/alpine/Dockerfile.hotspot.nightly.full | 20 +------ .../alpine/Dockerfile.hotspot.releases.full | 6 +- 11/jre/alpine/Dockerfile.openj9.nightly.full | 16 +----- 11/jre/alpine/Dockerfile.openj9.releases.full | 6 +- 11/jre/centos/Dockerfile.hotspot.nightly.full | 20 +++---- .../centos/Dockerfile.hotspot.releases.full | 18 +++--- 11/jre/centos/Dockerfile.openj9.nightly.full | 16 ++---- 11/jre/centos/Dockerfile.openj9.releases.full | 10 ++-- 11/jre/clefos/Dockerfile.hotspot.nightly.full | 20 +------ .../clefos/Dockerfile.hotspot.releases.full | 6 +- 11/jre/clefos/Dockerfile.openj9.nightly.full | 16 +----- 11/jre/clefos/Dockerfile.openj9.releases.full | 6 +- 11/jre/debian/Dockerfile.hotspot.nightly.full | 20 +++---- .../debian/Dockerfile.hotspot.releases.full | 22 ++++---- 11/jre/debian/Dockerfile.openj9.nightly.full | 16 ++---- 11/jre/debian/Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../debianslim/Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- 11/jre/leap/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jre/leap/Dockerfile.hotspot.releases.full | 18 +++--- 11/jre/leap/Dockerfile.openj9.nightly.full | 16 ++---- 11/jre/leap/Dockerfile.openj9.releases.full | 10 ++-- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../tumbleweed/Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 16 +++--- 11/jre/ubi/Dockerfile.hotspot.nightly.full | 20 +++---- 11/jre/ubi/Dockerfile.hotspot.releases.full | 20 +++---- 11/jre/ubi/Dockerfile.openj9.nightly.full | 16 ++---- 11/jre/ubi/Dockerfile.openj9.releases.full | 16 +++--- 11/jre/ubuntu/Dockerfile.hotspot.nightly.full | 20 +++---- .../ubuntu/Dockerfile.hotspot.releases.full | 22 ++++---- 11/jre/ubuntu/Dockerfile.openj9.nightly.full | 16 ++---- 11/jre/ubuntu/Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.hotspot.nightly.slim | 34 +++++------ .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 33 ++++++----- 11/jre/windows/nanoserver-1809/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ 11/jre/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.nightly.full | 51 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- 15/jdk/alpine/Dockerfile.hotspot.nightly.full | 16 ------ 15/jdk/alpine/Dockerfile.hotspot.nightly.slim | 16 ------ 15/jdk/alpine/Dockerfile.openj9.nightly.full | 12 ---- 15/jdk/alpine/Dockerfile.openj9.nightly.slim | 12 ---- 15/jdk/alpine/slim-java.sh | 5 +- 15/jdk/centos/Dockerfile.hotspot.nightly.full | 4 -- 15/jdk/centos/Dockerfile.hotspot.nightly.slim | 4 -- 15/jdk/centos/Dockerfile.openj9.nightly.full | 8 --- 15/jdk/centos/Dockerfile.openj9.nightly.slim | 8 --- 15/jdk/centos/slim-java.sh | 5 +- 15/jdk/clefos/Dockerfile.hotspot.nightly.full | 16 ------ 15/jdk/clefos/Dockerfile.hotspot.nightly.slim | 16 ------ 15/jdk/clefos/Dockerfile.openj9.nightly.full | 12 ---- 15/jdk/clefos/Dockerfile.openj9.nightly.slim | 12 ---- 15/jdk/clefos/slim-java.sh | 5 +- 15/jdk/debian/Dockerfile.openj9.nightly.full | 4 -- 15/jdk/debian/Dockerfile.openj9.nightly.slim | 4 -- 15/jdk/debian/slim-java.sh | 5 +- .../debianslim/Dockerfile.openj9.nightly.full | 4 -- .../debianslim/Dockerfile.openj9.nightly.slim | 4 -- 15/jdk/debianslim/slim-java.sh | 5 +- 15/jdk/leap/Dockerfile.hotspot.nightly.full | 4 -- 15/jdk/leap/Dockerfile.openj9.nightly.full | 8 --- .../tumbleweed/Dockerfile.openj9.nightly.full | 4 -- .../Dockerfile.hotspot.nightly.full | 4 -- .../Dockerfile.openj9.nightly.full | 4 -- 15/jdk/ubi/Dockerfile.hotspot.nightly.full | 4 -- 15/jdk/ubi/Dockerfile.hotspot.nightly.slim | 4 -- 15/jdk/ubi/Dockerfile.openj9.nightly.full | 4 -- 15/jdk/ubi/Dockerfile.openj9.nightly.slim | 4 -- 15/jdk/ubi/slim-java.sh | 5 +- 15/jdk/ubuntu/Dockerfile.openj9.nightly.full | 4 -- 15/jdk/ubuntu/Dockerfile.openj9.nightly.slim | 4 -- 15/jdk/ubuntu/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 27 +++++---- .../Dockerfile.hotspot.nightly.slim | 30 +++++----- .../Dockerfile.hotspot.releases.full | 14 ++--- .../Dockerfile.openj9.nightly.full | 29 +++++----- .../Dockerfile.openj9.nightly.slim | 32 +++++------ 15/jdk/windows/nanoserver-1809/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 27 +++++---- .../Dockerfile.hotspot.nightly.slim | 30 +++++----- .../Dockerfile.openj9.nightly.full | 29 +++++----- .../Dockerfile.openj9.nightly.slim | 32 +++++------ 15/jdk/windows/nanoserver-1909/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 53 ++++++++++++++++++ .../Dockerfile.openj9.nightly.full | 54 ++++++++++++++++++ .../Dockerfile.openj9.nightly.slim | 54 ++++++++++++++++++ 15/jdk/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 39 +++++++------ .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 39 +++++++------ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 39 +++++++------ .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 39 +++++++------ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- 15/jre/alpine/Dockerfile.hotspot.nightly.full | 16 ------ 15/jre/alpine/Dockerfile.openj9.nightly.full | 12 ---- 15/jre/centos/Dockerfile.hotspot.nightly.full | 4 -- 15/jre/centos/Dockerfile.openj9.nightly.full | 8 --- 15/jre/clefos/Dockerfile.hotspot.nightly.full | 16 ------ 15/jre/clefos/Dockerfile.openj9.nightly.full | 12 ---- 15/jre/debian/Dockerfile.openj9.nightly.full | 4 -- .../debianslim/Dockerfile.openj9.nightly.full | 4 -- 15/jre/leap/Dockerfile.hotspot.nightly.full | 4 -- 15/jre/leap/Dockerfile.openj9.nightly.full | 8 --- .../tumbleweed/Dockerfile.openj9.nightly.full | 4 -- .../Dockerfile.hotspot.nightly.full | 4 -- .../Dockerfile.openj9.nightly.full | 4 -- 15/jre/ubi/Dockerfile.hotspot.nightly.full | 4 -- 15/jre/ubi/Dockerfile.openj9.nightly.full | 4 -- 15/jre/ubuntu/Dockerfile.openj9.nightly.full | 4 -- .../Dockerfile.hotspot.nightly.full | 27 +++++---- .../Dockerfile.hotspot.releases.full | 14 ++--- .../Dockerfile.openj9.nightly.full | 29 +++++----- .../Dockerfile.hotspot.nightly.full | 27 +++++---- .../Dockerfile.openj9.nightly.full | 29 +++++----- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.openj9.nightly.slim | 53 ++++++++++++++++++ 15/jre/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 39 +++++++------ .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 39 +++++++------ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.nightly.full | 51 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 39 +++++++------ .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 39 +++++++------ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- 16/jdk/alpine/Dockerfile.hotspot.nightly.full | 56 ++----------------- 16/jdk/alpine/Dockerfile.hotspot.nightly.slim | 56 ++----------------- .../alpine/Dockerfile.hotspot.releases.full | 6 +- .../alpine/Dockerfile.hotspot.releases.slim | 6 +- 16/jdk/alpine/Dockerfile.openj9.nightly.full | 18 +----- 16/jdk/alpine/Dockerfile.openj9.nightly.slim | 18 +----- 16/jdk/alpine/Dockerfile.openj9.releases.full | 6 +- 16/jdk/alpine/Dockerfile.openj9.releases.slim | 6 +- 16/jdk/alpine/slim-java.sh | 5 +- 16/jdk/centos/Dockerfile.hotspot.nightly.full | 22 +++----- 16/jdk/centos/Dockerfile.hotspot.nightly.slim | 22 +++----- .../centos/Dockerfile.hotspot.releases.full | 18 +++--- .../centos/Dockerfile.hotspot.releases.slim | 18 +++--- 16/jdk/centos/Dockerfile.openj9.nightly.full | 18 ++---- 16/jdk/centos/Dockerfile.openj9.nightly.slim | 18 ++---- 16/jdk/centos/Dockerfile.openj9.releases.full | 10 ++-- 16/jdk/centos/Dockerfile.openj9.releases.slim | 10 ++-- 16/jdk/centos/slim-java.sh | 5 +- 16/jdk/clefos/Dockerfile.hotspot.nightly.full | 22 +------- 16/jdk/clefos/Dockerfile.hotspot.nightly.slim | 22 +------- .../clefos/Dockerfile.hotspot.releases.full | 6 +- .../clefos/Dockerfile.hotspot.releases.slim | 6 +- 16/jdk/clefos/Dockerfile.openj9.nightly.full | 18 +----- 16/jdk/clefos/Dockerfile.openj9.nightly.slim | 18 +----- 16/jdk/clefos/Dockerfile.openj9.releases.full | 6 +- 16/jdk/clefos/Dockerfile.openj9.releases.slim | 6 +- 16/jdk/clefos/slim-java.sh | 5 +- 16/jdk/debian/Dockerfile.hotspot.nightly.full | 22 ++++---- 16/jdk/debian/Dockerfile.hotspot.nightly.slim | 22 ++++---- .../debian/Dockerfile.hotspot.releases.full | 22 ++++---- .../debian/Dockerfile.hotspot.releases.slim | 22 ++++---- 16/jdk/debian/Dockerfile.openj9.nightly.full | 18 +++--- 16/jdk/debian/Dockerfile.openj9.nightly.slim | 18 +++--- 16/jdk/debian/Dockerfile.openj9.releases.full | 14 ++--- 16/jdk/debian/Dockerfile.openj9.releases.slim | 14 ++--- 16/jdk/debian/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 22 ++++---- .../Dockerfile.hotspot.nightly.slim | 22 ++++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../Dockerfile.hotspot.releases.slim | 22 ++++---- .../debianslim/Dockerfile.openj9.nightly.full | 18 +++--- .../debianslim/Dockerfile.openj9.nightly.slim | 18 +++--- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.openj9.releases.slim | 14 ++--- 16/jdk/debianslim/slim-java.sh | 5 +- 16/jdk/leap/Dockerfile.hotspot.nightly.full | 22 +++----- 16/jdk/leap/Dockerfile.hotspot.releases.full | 18 +++--- 16/jdk/leap/Dockerfile.openj9.nightly.full | 18 ++---- 16/jdk/leap/Dockerfile.openj9.releases.full | 10 ++-- .../Dockerfile.hotspot.nightly.full | 22 ++++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../tumbleweed/Dockerfile.openj9.nightly.full | 18 +++--- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 24 ++++---- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 20 +++---- .../Dockerfile.openj9.releases.full | 16 +++--- 16/jdk/ubi/Dockerfile.hotspot.nightly.full | 24 ++++---- 16/jdk/ubi/Dockerfile.hotspot.nightly.slim | 24 ++++---- 16/jdk/ubi/Dockerfile.hotspot.releases.full | 20 +++---- 16/jdk/ubi/Dockerfile.hotspot.releases.slim | 20 +++---- 16/jdk/ubi/Dockerfile.openj9.nightly.full | 20 +++---- 16/jdk/ubi/Dockerfile.openj9.nightly.slim | 20 +++---- 16/jdk/ubi/Dockerfile.openj9.releases.full | 16 +++--- 16/jdk/ubi/Dockerfile.openj9.releases.slim | 16 +++--- 16/jdk/ubi/slim-java.sh | 5 +- 16/jdk/ubuntu/Dockerfile.hotspot.nightly.full | 22 ++++---- 16/jdk/ubuntu/Dockerfile.hotspot.nightly.slim | 22 ++++---- .../ubuntu/Dockerfile.hotspot.releases.full | 22 ++++---- .../ubuntu/Dockerfile.hotspot.releases.slim | 22 ++++---- 16/jdk/ubuntu/Dockerfile.openj9.nightly.full | 18 +++--- 16/jdk/ubuntu/Dockerfile.openj9.nightly.slim | 18 +++--- 16/jdk/ubuntu/Dockerfile.openj9.releases.full | 14 ++--- 16/jdk/ubuntu/Dockerfile.openj9.releases.slim | 14 ++--- 16/jdk/ubuntu/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.slim | 36 ++++++------ .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 35 ++++++------ .../Dockerfile.openj9.nightly.slim | 38 ++++++------- 16/jdk/windows/nanoserver-1809/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.slim | 36 ++++++------ .../Dockerfile.openj9.nightly.full | 35 ++++++------ .../Dockerfile.openj9.nightly.slim | 38 ++++++------- 16/jdk/windows/nanoserver-1909/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 53 ++++++++++++++++++ .../Dockerfile.openj9.nightly.full | 54 ++++++++++++++++++ .../Dockerfile.openj9.nightly.slim | 54 ++++++++++++++++++ 16/jdk/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- 16/jre/alpine/Dockerfile.hotspot.nightly.full | 56 ++----------------- .../alpine/Dockerfile.hotspot.releases.full | 6 +- 16/jre/alpine/Dockerfile.openj9.nightly.full | 18 +----- 16/jre/alpine/Dockerfile.openj9.releases.full | 6 +- 16/jre/centos/Dockerfile.hotspot.nightly.full | 22 +++----- .../centos/Dockerfile.hotspot.releases.full | 18 +++--- 16/jre/centos/Dockerfile.openj9.nightly.full | 18 ++---- 16/jre/centos/Dockerfile.openj9.releases.full | 10 ++-- 16/jre/clefos/Dockerfile.hotspot.nightly.full | 22 +------- .../clefos/Dockerfile.hotspot.releases.full | 6 +- 16/jre/clefos/Dockerfile.openj9.nightly.full | 18 +----- 16/jre/clefos/Dockerfile.openj9.releases.full | 6 +- 16/jre/debian/Dockerfile.hotspot.nightly.full | 22 ++++---- .../debian/Dockerfile.hotspot.releases.full | 22 ++++---- 16/jre/debian/Dockerfile.openj9.nightly.full | 18 +++--- 16/jre/debian/Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 22 ++++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../debianslim/Dockerfile.openj9.nightly.full | 18 +++--- .../Dockerfile.openj9.releases.full | 14 ++--- 16/jre/leap/Dockerfile.hotspot.nightly.full | 22 +++----- 16/jre/leap/Dockerfile.hotspot.releases.full | 18 +++--- 16/jre/leap/Dockerfile.openj9.nightly.full | 18 ++---- 16/jre/leap/Dockerfile.openj9.releases.full | 10 ++-- .../Dockerfile.hotspot.nightly.full | 22 ++++---- .../Dockerfile.hotspot.releases.full | 22 ++++---- .../tumbleweed/Dockerfile.openj9.nightly.full | 18 +++--- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 24 ++++---- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 20 +++---- .../Dockerfile.openj9.releases.full | 16 +++--- 16/jre/ubi/Dockerfile.hotspot.nightly.full | 24 ++++---- 16/jre/ubi/Dockerfile.hotspot.releases.full | 20 +++---- 16/jre/ubi/Dockerfile.openj9.nightly.full | 20 +++---- 16/jre/ubi/Dockerfile.openj9.releases.full | 16 +++--- 16/jre/ubuntu/Dockerfile.hotspot.nightly.full | 22 ++++---- .../ubuntu/Dockerfile.hotspot.releases.full | 22 ++++---- 16/jre/ubuntu/Dockerfile.openj9.nightly.full | 18 +++--- 16/jre/ubuntu/Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.slim | 36 ++++++------ .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 35 ++++++------ .../Dockerfile.openj9.nightly.slim | 38 ++++++------- 16/jre/windows/nanoserver-1809/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.slim | 36 ++++++------ .../Dockerfile.openj9.nightly.full | 35 ++++++------ .../Dockerfile.openj9.nightly.slim | 38 ++++++------- 16/jre/windows/nanoserver-1909/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.openj9.nightly.slim | 53 ++++++++++++++++++ 16/jre/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- .../Dockerfile.hotspot.nightly.full | 51 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 36 +++++++----- .../Dockerfile.openj9.nightly.full | 38 ++++++++----- 8/jdk/alpine/Dockerfile.hotspot.nightly.full | 20 +------ 8/jdk/alpine/Dockerfile.hotspot.nightly.slim | 20 +------ 8/jdk/alpine/Dockerfile.hotspot.releases.full | 6 +- 8/jdk/alpine/Dockerfile.hotspot.releases.slim | 6 +- 8/jdk/alpine/Dockerfile.openj9.nightly.full | 16 +----- 8/jdk/alpine/Dockerfile.openj9.nightly.slim | 16 +----- 8/jdk/alpine/Dockerfile.openj9.releases.full | 6 +- 8/jdk/alpine/Dockerfile.openj9.releases.slim | 6 +- 8/jdk/alpine/slim-java.sh | 5 +- 8/jdk/centos/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jdk/centos/Dockerfile.hotspot.nightly.slim | 20 +++---- 8/jdk/centos/Dockerfile.hotspot.releases.full | 18 +++--- 8/jdk/centos/Dockerfile.hotspot.releases.slim | 18 +++--- 8/jdk/centos/Dockerfile.openj9.nightly.full | 16 ++---- 8/jdk/centos/Dockerfile.openj9.nightly.slim | 16 ++---- 8/jdk/centos/Dockerfile.openj9.releases.full | 10 ++-- 8/jdk/centos/Dockerfile.openj9.releases.slim | 10 ++-- 8/jdk/centos/slim-java.sh | 5 +- 8/jdk/clefos/Dockerfile.hotspot.nightly.full | 20 +------ 8/jdk/clefos/Dockerfile.hotspot.nightly.slim | 20 +------ 8/jdk/clefos/Dockerfile.hotspot.releases.full | 6 +- 8/jdk/clefos/Dockerfile.hotspot.releases.slim | 6 +- 8/jdk/clefos/Dockerfile.openj9.nightly.full | 16 +----- 8/jdk/clefos/Dockerfile.openj9.nightly.slim | 16 +----- 8/jdk/clefos/Dockerfile.openj9.releases.full | 6 +- 8/jdk/clefos/Dockerfile.openj9.releases.slim | 6 +- 8/jdk/clefos/slim-java.sh | 5 +- 8/jdk/debian/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jdk/debian/Dockerfile.hotspot.nightly.slim | 20 +++---- 8/jdk/debian/Dockerfile.hotspot.releases.full | 22 +++----- 8/jdk/debian/Dockerfile.hotspot.releases.slim | 22 +++----- 8/jdk/debian/Dockerfile.openj9.nightly.full | 16 ++---- 8/jdk/debian/Dockerfile.openj9.nightly.slim | 16 ++---- 8/jdk/debian/Dockerfile.openj9.releases.full | 14 ++--- 8/jdk/debian/Dockerfile.openj9.releases.slim | 14 ++--- 8/jdk/debian/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.nightly.slim | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 +++----- .../Dockerfile.hotspot.releases.slim | 22 +++----- .../debianslim/Dockerfile.openj9.nightly.full | 16 ++---- .../debianslim/Dockerfile.openj9.nightly.slim | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.openj9.releases.slim | 14 ++--- 8/jdk/debianslim/slim-java.sh | 5 +- 8/jdk/leap/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jdk/leap/Dockerfile.hotspot.releases.full | 18 +++--- 8/jdk/leap/Dockerfile.openj9.nightly.full | 16 ++---- 8/jdk/leap/Dockerfile.openj9.releases.full | 10 ++-- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 +++----- .../tumbleweed/Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 16 +++--- 8/jdk/ubi/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jdk/ubi/Dockerfile.hotspot.nightly.slim | 20 +++---- 8/jdk/ubi/Dockerfile.hotspot.releases.full | 20 +++---- 8/jdk/ubi/Dockerfile.hotspot.releases.slim | 20 +++---- 8/jdk/ubi/Dockerfile.openj9.nightly.full | 16 ++---- 8/jdk/ubi/Dockerfile.openj9.nightly.slim | 16 ++---- 8/jdk/ubi/Dockerfile.openj9.releases.full | 16 +++--- 8/jdk/ubi/Dockerfile.openj9.releases.slim | 16 +++--- 8/jdk/ubi/slim-java.sh | 5 +- 8/jdk/ubuntu/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim | 20 +++---- 8/jdk/ubuntu/Dockerfile.hotspot.releases.full | 22 +++----- 8/jdk/ubuntu/Dockerfile.hotspot.releases.slim | 22 +++----- 8/jdk/ubuntu/Dockerfile.openj9.nightly.full | 16 ++---- 8/jdk/ubuntu/Dockerfile.openj9.nightly.slim | 16 ++---- 8/jdk/ubuntu/Dockerfile.openj9.releases.full | 14 ++--- 8/jdk/ubuntu/Dockerfile.openj9.releases.slim | 14 ++--- 8/jdk/ubuntu/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.hotspot.nightly.slim | 34 +++++------ .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.openj9.nightly.slim | 36 ++++++------ 8/jdk/windows/nanoserver-1809/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.hotspot.nightly.slim | 34 +++++------ .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.openj9.nightly.slim | 36 ++++++------ 8/jdk/windows/nanoserver-1909/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.slim | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.openj9.nightly.slim | 53 ++++++++++++++++++ 8/jdk/windows/nanoserver-20h2/slim-java.sh | 5 +- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.nightly.full | 51 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- 8/jre/alpine/Dockerfile.hotspot.nightly.full | 20 +------ 8/jre/alpine/Dockerfile.hotspot.releases.full | 6 +- 8/jre/alpine/Dockerfile.openj9.nightly.full | 16 +----- 8/jre/alpine/Dockerfile.openj9.releases.full | 6 +- 8/jre/centos/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jre/centos/Dockerfile.hotspot.releases.full | 18 +++--- 8/jre/centos/Dockerfile.openj9.nightly.full | 16 ++---- 8/jre/centos/Dockerfile.openj9.releases.full | 10 ++-- 8/jre/clefos/Dockerfile.hotspot.nightly.full | 20 +------ 8/jre/clefos/Dockerfile.hotspot.releases.full | 6 +- 8/jre/clefos/Dockerfile.openj9.nightly.full | 16 +----- 8/jre/clefos/Dockerfile.openj9.releases.full | 6 +- 8/jre/debian/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jre/debian/Dockerfile.hotspot.releases.full | 22 +++----- 8/jre/debian/Dockerfile.openj9.nightly.full | 16 ++---- 8/jre/debian/Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 +++----- .../debianslim/Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- 8/jre/leap/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jre/leap/Dockerfile.hotspot.releases.full | 18 +++--- 8/jre/leap/Dockerfile.openj9.nightly.full | 16 ++---- 8/jre/leap/Dockerfile.openj9.releases.full | 10 ++-- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 22 +++----- .../tumbleweed/Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 20 +++---- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 16 ++---- .../Dockerfile.openj9.releases.full | 16 +++--- 8/jre/ubi/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jre/ubi/Dockerfile.hotspot.releases.full | 20 +++---- 8/jre/ubi/Dockerfile.openj9.nightly.full | 16 ++---- 8/jre/ubi/Dockerfile.openj9.releases.full | 16 +++--- 8/jre/ubuntu/Dockerfile.hotspot.nightly.full | 20 +++---- 8/jre/ubuntu/Dockerfile.hotspot.releases.full | 22 +++----- 8/jre/ubuntu/Dockerfile.openj9.nightly.full | 16 ++---- 8/jre/ubuntu/Dockerfile.openj9.releases.full | 14 ++--- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.hotspot.releases.full | 20 +++---- .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.full | 31 +++++----- .../Dockerfile.openj9.nightly.full | 33 ++++++----- .../Dockerfile.hotspot.nightly.full | 52 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 53 ++++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.hotspot.nightly.full | 51 +++++++++++++++++ .../Dockerfile.openj9.nightly.full | 52 +++++++++++++++++ .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.hotspot.releases.full | 41 +++++++------- .../Dockerfile.openj9.nightly.full | 36 +++++++----- .../Dockerfile.openj9.releases.full | 41 +++++++------- .../Dockerfile.hotspot.nightly.full | 34 ++++++----- .../Dockerfile.openj9.nightly.full | 36 +++++++----- 615 files changed, 7777 insertions(+), 6097 deletions(-) create mode 100644 11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim create mode 100644 11/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 11/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 11/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 11/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 11/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim create mode 100644 15/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 15/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim create mode 100644 15/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 15/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim create mode 100644 16/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 16/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim create mode 100644 16/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 16/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim create mode 100644 8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim create mode 100644 8/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 8/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full create mode 100644 8/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full create mode 100644 8/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full create mode 100644 8/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full create mode 100644 8/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full diff --git a/11/jdk/alpine/Dockerfile.hotspot.nightly.full b/11/jdk/alpine/Dockerfile.hotspot.nightly.full index b1ce1f58d..376969b9a 100644 --- a/11/jdk/alpine/Dockerfile.hotspot.nightly.full +++ b/11/jdk/alpine/Dockerfile.hotspot.nightly.full @@ -60,25 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.hotspot.nightly.slim b/11/jdk/alpine/Dockerfile.hotspot.nightly.slim index 8ac0aba19..a6af1bcfd 100644 --- a/11/jdk/alpine/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/alpine/Dockerfile.hotspot.nightly.slim @@ -62,25 +62,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.hotspot.releases.full b/11/jdk/alpine/Dockerfile.hotspot.releases.full index 9b1792999..4bc6583e3 100644 --- a/11/jdk/alpine/Dockerfile.hotspot.releases.full +++ b/11/jdk/alpine/Dockerfile.hotspot.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.hotspot.releases.slim b/11/jdk/alpine/Dockerfile.hotspot.releases.slim index 8733da48b..a0b6f6ac9 100644 --- a/11/jdk/alpine/Dockerfile.hotspot.releases.slim +++ b/11/jdk/alpine/Dockerfile.hotspot.releases.slim @@ -54,7 +54,7 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -63,8 +63,8 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.openj9.nightly.full b/11/jdk/alpine/Dockerfile.openj9.nightly.full index 927888ab6..aff1a963f 100644 --- a/11/jdk/alpine/Dockerfile.openj9.nightly.full +++ b/11/jdk/alpine/Dockerfile.openj9.nightly.full @@ -60,21 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.openj9.nightly.slim b/11/jdk/alpine/Dockerfile.openj9.nightly.slim index 8b40668a8..b5eb9f3fe 100644 --- a/11/jdk/alpine/Dockerfile.openj9.nightly.slim +++ b/11/jdk/alpine/Dockerfile.openj9.nightly.slim @@ -62,21 +62,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.openj9.releases.full b/11/jdk/alpine/Dockerfile.openj9.releases.full index 6eb2d5383..b6ffc73b0 100644 --- a/11/jdk/alpine/Dockerfile.openj9.releases.full +++ b/11/jdk/alpine/Dockerfile.openj9.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/Dockerfile.openj9.releases.slim b/11/jdk/alpine/Dockerfile.openj9.releases.slim index 50e64bbf3..d81e79ab4 100644 --- a/11/jdk/alpine/Dockerfile.openj9.releases.slim +++ b/11/jdk/alpine/Dockerfile.openj9.releases.slim @@ -54,7 +54,7 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -63,8 +63,8 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/alpine/slim-java.sh b/11/jdk/alpine/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/alpine/slim-java.sh +++ b/11/jdk/alpine/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/centos/Dockerfile.hotspot.nightly.full b/11/jdk/centos/Dockerfile.hotspot.nightly.full index 0fcd6ca10..3e839a353 100644 --- a/11/jdk/centos/Dockerfile.hotspot.nightly.full +++ b/11/jdk/centos/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.hotspot.nightly.slim b/11/jdk/centos/Dockerfile.hotspot.nightly.slim index 94382aa04..3c682be04 100644 --- a/11/jdk/centos/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/centos/Dockerfile.hotspot.nightly.slim @@ -32,24 +32,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.hotspot.releases.full b/11/jdk/centos/Dockerfile.hotspot.releases.full index eab66a807..e10d125ba 100644 --- a/11/jdk/centos/Dockerfile.hotspot.releases.full +++ b/11/jdk/centos/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.hotspot.releases.slim b/11/jdk/centos/Dockerfile.hotspot.releases.slim index 199a77ec0..c0083eda9 100644 --- a/11/jdk/centos/Dockerfile.hotspot.releases.slim +++ b/11/jdk/centos/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -32,20 +32,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.openj9.nightly.full b/11/jdk/centos/Dockerfile.openj9.nightly.full index 46b08805a..20dba672c 100644 --- a/11/jdk/centos/Dockerfile.openj9.nightly.full +++ b/11/jdk/centos/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.openj9.nightly.slim b/11/jdk/centos/Dockerfile.openj9.nightly.slim index 5124ca19d..772160801 100644 --- a/11/jdk/centos/Dockerfile.openj9.nightly.slim +++ b/11/jdk/centos/Dockerfile.openj9.nightly.slim @@ -31,21 +31,13 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.openj9.releases.full b/11/jdk/centos/Dockerfile.openj9.releases.full index 2f25c3d16..33f9add46 100644 --- a/11/jdk/centos/Dockerfile.openj9.releases.full +++ b/11/jdk/centos/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/Dockerfile.openj9.releases.slim b/11/jdk/centos/Dockerfile.openj9.releases.slim index 4427f43c4..e12161b74 100644 --- a/11/jdk/centos/Dockerfile.openj9.releases.slim +++ b/11/jdk/centos/Dockerfile.openj9.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -32,12 +32,12 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/centos/slim-java.sh b/11/jdk/centos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/centos/slim-java.sh +++ b/11/jdk/centos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/clefos/Dockerfile.hotspot.nightly.full b/11/jdk/clefos/Dockerfile.hotspot.nightly.full index 1702639f6..02b023abf 100644 --- a/11/jdk/clefos/Dockerfile.hotspot.nightly.full +++ b/11/jdk/clefos/Dockerfile.hotspot.nightly.full @@ -29,25 +29,9 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.hotspot.nightly.slim b/11/jdk/clefos/Dockerfile.hotspot.nightly.slim index 0ba3757d1..72c015523 100644 --- a/11/jdk/clefos/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/clefos/Dockerfile.hotspot.nightly.slim @@ -31,25 +31,9 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.hotspot.releases.full b/11/jdk/clefos/Dockerfile.hotspot.releases.full index 97d37b902..01cbb159b 100644 --- a/11/jdk/clefos/Dockerfile.hotspot.releases.full +++ b/11/jdk/clefos/Dockerfile.hotspot.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.hotspot.releases.slim b/11/jdk/clefos/Dockerfile.hotspot.releases.slim index a3760d382..81c509d2b 100644 --- a/11/jdk/clefos/Dockerfile.hotspot.releases.slim +++ b/11/jdk/clefos/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -32,8 +32,8 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.openj9.nightly.full b/11/jdk/clefos/Dockerfile.openj9.nightly.full index 90f9365ed..e984f777b 100644 --- a/11/jdk/clefos/Dockerfile.openj9.nightly.full +++ b/11/jdk/clefos/Dockerfile.openj9.nightly.full @@ -29,21 +29,9 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.openj9.nightly.slim b/11/jdk/clefos/Dockerfile.openj9.nightly.slim index 873308bf0..7312c3b19 100644 --- a/11/jdk/clefos/Dockerfile.openj9.nightly.slim +++ b/11/jdk/clefos/Dockerfile.openj9.nightly.slim @@ -31,21 +31,9 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.openj9.releases.full b/11/jdk/clefos/Dockerfile.openj9.releases.full index a2c4cce06..0ff97c393 100644 --- a/11/jdk/clefos/Dockerfile.openj9.releases.full +++ b/11/jdk/clefos/Dockerfile.openj9.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/Dockerfile.openj9.releases.slim b/11/jdk/clefos/Dockerfile.openj9.releases.slim index 56ab3afdf..5bc434faf 100644 --- a/11/jdk/clefos/Dockerfile.openj9.releases.slim +++ b/11/jdk/clefos/Dockerfile.openj9.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -32,8 +32,8 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/clefos/slim-java.sh b/11/jdk/clefos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/clefos/slim-java.sh +++ b/11/jdk/clefos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/debian/Dockerfile.hotspot.nightly.full b/11/jdk/debian/Dockerfile.hotspot.nightly.full index 8b794ee9e..ff118146b 100644 --- a/11/jdk/debian/Dockerfile.hotspot.nightly.full +++ b/11/jdk/debian/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.hotspot.nightly.slim b/11/jdk/debian/Dockerfile.hotspot.nightly.slim index e06bcdf9d..a30df77ff 100644 --- a/11/jdk/debian/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/debian/Dockerfile.hotspot.nightly.slim @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.hotspot.releases.full b/11/jdk/debian/Dockerfile.hotspot.releases.full index 467841191..8fb4f453d 100644 --- a/11/jdk/debian/Dockerfile.hotspot.releases.full +++ b/11/jdk/debian/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.hotspot.releases.slim b/11/jdk/debian/Dockerfile.hotspot.releases.slim index c91b1fd5b..7a2621957 100644 --- a/11/jdk/debian/Dockerfile.hotspot.releases.slim +++ b/11/jdk/debian/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.openj9.nightly.full b/11/jdk/debian/Dockerfile.openj9.nightly.full index f8c3c236e..bd277708e 100644 --- a/11/jdk/debian/Dockerfile.openj9.nightly.full +++ b/11/jdk/debian/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.openj9.nightly.slim b/11/jdk/debian/Dockerfile.openj9.nightly.slim index d12e6d032..84705f7c9 100644 --- a/11/jdk/debian/Dockerfile.openj9.nightly.slim +++ b/11/jdk/debian/Dockerfile.openj9.nightly.slim @@ -34,21 +34,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.openj9.releases.full b/11/jdk/debian/Dockerfile.openj9.releases.full index f9398418e..f9b4c5ab4 100644 --- a/11/jdk/debian/Dockerfile.openj9.releases.full +++ b/11/jdk/debian/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/Dockerfile.openj9.releases.slim b/11/jdk/debian/Dockerfile.openj9.releases.slim index a1728e2a5..3bb6d5f02 100644 --- a/11/jdk/debian/Dockerfile.openj9.releases.slim +++ b/11/jdk/debian/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debian/slim-java.sh b/11/jdk/debian/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/debian/slim-java.sh +++ b/11/jdk/debian/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/debianslim/Dockerfile.hotspot.nightly.full b/11/jdk/debianslim/Dockerfile.hotspot.nightly.full index 3b59e662f..19a6652e0 100644 --- a/11/jdk/debianslim/Dockerfile.hotspot.nightly.full +++ b/11/jdk/debianslim/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.hotspot.nightly.slim b/11/jdk/debianslim/Dockerfile.hotspot.nightly.slim index bbf6ab81e..eceeac8b5 100644 --- a/11/jdk/debianslim/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/debianslim/Dockerfile.hotspot.nightly.slim @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.hotspot.releases.full b/11/jdk/debianslim/Dockerfile.hotspot.releases.full index 3d1f8ed75..aa2e064c4 100644 --- a/11/jdk/debianslim/Dockerfile.hotspot.releases.full +++ b/11/jdk/debianslim/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.hotspot.releases.slim b/11/jdk/debianslim/Dockerfile.hotspot.releases.slim index bf3b9bb0d..7138b4506 100644 --- a/11/jdk/debianslim/Dockerfile.hotspot.releases.slim +++ b/11/jdk/debianslim/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.openj9.nightly.full b/11/jdk/debianslim/Dockerfile.openj9.nightly.full index 901b3f798..156ae2cb8 100644 --- a/11/jdk/debianslim/Dockerfile.openj9.nightly.full +++ b/11/jdk/debianslim/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.openj9.nightly.slim b/11/jdk/debianslim/Dockerfile.openj9.nightly.slim index ac5ebdcd7..d33ae7a7c 100644 --- a/11/jdk/debianslim/Dockerfile.openj9.nightly.slim +++ b/11/jdk/debianslim/Dockerfile.openj9.nightly.slim @@ -34,21 +34,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.openj9.releases.full b/11/jdk/debianslim/Dockerfile.openj9.releases.full index f61053188..a8503be30 100644 --- a/11/jdk/debianslim/Dockerfile.openj9.releases.full +++ b/11/jdk/debianslim/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/Dockerfile.openj9.releases.slim b/11/jdk/debianslim/Dockerfile.openj9.releases.slim index 7d8a91f59..f12c5406b 100644 --- a/11/jdk/debianslim/Dockerfile.openj9.releases.slim +++ b/11/jdk/debianslim/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/debianslim/slim-java.sh b/11/jdk/debianslim/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/debianslim/slim-java.sh +++ b/11/jdk/debianslim/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/leap/Dockerfile.hotspot.nightly.full b/11/jdk/leap/Dockerfile.hotspot.nightly.full index d29c51696..72bf31f99 100644 --- a/11/jdk/leap/Dockerfile.hotspot.nightly.full +++ b/11/jdk/leap/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/leap/Dockerfile.hotspot.releases.full b/11/jdk/leap/Dockerfile.hotspot.releases.full index 985995a4e..0608176b8 100644 --- a/11/jdk/leap/Dockerfile.hotspot.releases.full +++ b/11/jdk/leap/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/leap/Dockerfile.openj9.nightly.full b/11/jdk/leap/Dockerfile.openj9.nightly.full index f3b4318dc..97a14e088 100644 --- a/11/jdk/leap/Dockerfile.openj9.nightly.full +++ b/11/jdk/leap/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/leap/Dockerfile.openj9.releases.full b/11/jdk/leap/Dockerfile.openj9.releases.full index 8487296b0..8e04520cb 100644 --- a/11/jdk/leap/Dockerfile.openj9.releases.full +++ b/11/jdk/leap/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/tumbleweed/Dockerfile.hotspot.nightly.full b/11/jdk/tumbleweed/Dockerfile.hotspot.nightly.full index 5d4e89025..9445d0f68 100644 --- a/11/jdk/tumbleweed/Dockerfile.hotspot.nightly.full +++ b/11/jdk/tumbleweed/Dockerfile.hotspot.nightly.full @@ -30,24 +30,24 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/tumbleweed/Dockerfile.hotspot.releases.full b/11/jdk/tumbleweed/Dockerfile.hotspot.releases.full index 0df7eb12f..60ee3f91c 100644 --- a/11/jdk/tumbleweed/Dockerfile.hotspot.releases.full +++ b/11/jdk/tumbleweed/Dockerfile.hotspot.releases.full @@ -24,30 +24,30 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/tumbleweed/Dockerfile.openj9.nightly.full b/11/jdk/tumbleweed/Dockerfile.openj9.nightly.full index 8e3bfac41..b18b3fbba 100644 --- a/11/jdk/tumbleweed/Dockerfile.openj9.nightly.full +++ b/11/jdk/tumbleweed/Dockerfile.openj9.nightly.full @@ -29,21 +29,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/tumbleweed/Dockerfile.openj9.releases.full b/11/jdk/tumbleweed/Dockerfile.openj9.releases.full index a33577697..43cbf2db2 100644 --- a/11/jdk/tumbleweed/Dockerfile.openj9.releases.full +++ b/11/jdk/tumbleweed/Dockerfile.openj9.releases.full @@ -24,22 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full b/11/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full index 4bea51518..6c5d241bf 100644 --- a/11/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/11/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi-minimal/Dockerfile.hotspot.releases.full b/11/jdk/ubi-minimal/Dockerfile.hotspot.releases.full index b8dac8c7a..280416b57 100644 --- a/11/jdk/ubi-minimal/Dockerfile.hotspot.releases.full +++ b/11/jdk/ubi-minimal/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9" \ + version="jdk-11.0.11+9" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi-minimal/Dockerfile.openj9.nightly.full b/11/jdk/ubi-minimal/Dockerfile.openj9.nightly.full index 6986641c6..39e55dd27 100644 --- a/11/jdk/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/11/jdk/ubi-minimal/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi-minimal/Dockerfile.openj9.releases.full b/11/jdk/ubi-minimal/Dockerfile.openj9.releases.full index f39439771..502f23141 100644 --- a/11/jdk/ubi-minimal/Dockerfile.openj9.releases.full +++ b/11/jdk/ubi-minimal/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9_openj9-0.24.0" \ + version="jdk-11.0.11+9_openj9-0.26.0" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.hotspot.nightly.full b/11/jdk/ubi/Dockerfile.hotspot.nightly.full index 5df166ef5..7046b601f 100644 --- a/11/jdk/ubi/Dockerfile.hotspot.nightly.full +++ b/11/jdk/ubi/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.hotspot.nightly.slim b/11/jdk/ubi/Dockerfile.hotspot.nightly.slim index 7daf702d8..0d0a6000a 100644 --- a/11/jdk/ubi/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/ubi/Dockerfile.hotspot.nightly.slim @@ -40,24 +40,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.hotspot.releases.full b/11/jdk/ubi/Dockerfile.hotspot.releases.full index f4d259c32..0a6f06366 100644 --- a/11/jdk/ubi/Dockerfile.hotspot.releases.full +++ b/11/jdk/ubi/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9" \ + version="jdk-11.0.11+9" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.hotspot.releases.slim b/11/jdk/ubi/Dockerfile.hotspot.releases.slim index 7114779f1..72253c78a 100644 --- a/11/jdk/ubi/Dockerfile.hotspot.releases.slim +++ b/11/jdk/ubi/Dockerfile.hotspot.releases.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9" \ + version="jdk-11.0.11+9" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -40,20 +40,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.openj9.nightly.full b/11/jdk/ubi/Dockerfile.openj9.nightly.full index b1f48903a..056cfc177 100644 --- a/11/jdk/ubi/Dockerfile.openj9.nightly.full +++ b/11/jdk/ubi/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.openj9.nightly.slim b/11/jdk/ubi/Dockerfile.openj9.nightly.slim index 3b87de91f..a61f6dd62 100644 --- a/11/jdk/ubi/Dockerfile.openj9.nightly.slim +++ b/11/jdk/ubi/Dockerfile.openj9.nightly.slim @@ -39,21 +39,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.openj9.releases.full b/11/jdk/ubi/Dockerfile.openj9.releases.full index 0e5effa3c..a691e4a19 100644 --- a/11/jdk/ubi/Dockerfile.openj9.releases.full +++ b/11/jdk/ubi/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9_openj9-0.24.0" \ + version="jdk-11.0.11+9_openj9-0.26.0" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/Dockerfile.openj9.releases.slim b/11/jdk/ubi/Dockerfile.openj9.releases.slim index 2a0badb7e..f3a8678fe 100644 --- a/11/jdk/ubi/Dockerfile.openj9.releases.slim +++ b/11/jdk/ubi/Dockerfile.openj9.releases.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9_openj9-0.24.0" \ + version="jdk-11.0.11+9_openj9-0.26.0" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -40,16 +40,16 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubi/slim-java.sh b/11/jdk/ubi/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/ubi/slim-java.sh +++ b/11/jdk/ubi/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.nightly.full b/11/jdk/ubuntu/Dockerfile.hotspot.nightly.full index d83f00d61..3f60678d3 100644 --- a/11/jdk/ubuntu/Dockerfile.hotspot.nightly.full +++ b/11/jdk/ubuntu/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim b/11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim index 12261d490..9e235ed55 100644 --- a/11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/ubuntu/Dockerfile.hotspot.nightly.slim @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='fa023019cf3f71902518fd0273ec581183e036116655d9b15588f4394dba4d75'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='108887e0991e1ba9010a41701977ee2737da4004eb5cead584baf13f4d73c929'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='fd94af49e886954d09fb9080c8cdcf02c533b5658bf767cfcc7d6dacb2753171'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='f6c9288f44e28d7f2d03b72f4b10fc8ffd04cf76179e020b5adc8267eab46e27'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='f8cfa97231260b9ef6c8656fa3b548edfb5e72a05b3de9dbbd27d678d377b2a3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='2c9bb22c037692329353e0e9fb6d86632ddb87faea37faac1c3d6ff1e5362f9b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='a73c2724ffb7d35c22b9fc91044e946453d4a562114f5267d54b5bc716b07094'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='3ea9304bc2d1921b19ecfd8c1ed7b6631cead71983d69e3d72971f3aa707733f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='caa8bc077b1311440ee1d70e91c9fa0599269395247d979f2b3516ef442b32cb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='3749c738d0c156ce672a116137423090d81b5ea5a3e5d2df9b50296197917569'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.releases.full b/11/jdk/ubuntu/Dockerfile.hotspot.releases.full index 3c0da985b..11a33a4e4 100644 --- a/11/jdk/ubuntu/Dockerfile.hotspot.releases.full +++ b/11/jdk/ubuntu/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.hotspot.releases.slim b/11/jdk/ubuntu/Dockerfile.hotspot.releases.slim index e5ab3ce75..46f11865a 100644 --- a/11/jdk/ubuntu/Dockerfile.hotspot.releases.slim +++ b/11/jdk/ubuntu/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='e1d130a284f0881893711f17df83198d320c16f807de823c788407af019b356b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='945b114bd0a617d742653ac1ae89d35384bf89389046a44681109cf8e4f4af91'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='b55e5d774bcec96b7e6ffc8178a17914ab151414f7048abab3afe3c2febb9a20'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='5d81979d27d9d8b3ed5bca1a91fc899cbbfb3d907f445ee7329628105e92f52c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.openj9.nightly.full b/11/jdk/ubuntu/Dockerfile.openj9.nightly.full index 7f78627f4..a68d92ba0 100644 --- a/11/jdk/ubuntu/Dockerfile.openj9.nightly.full +++ b/11/jdk/ubuntu/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.openj9.nightly.slim b/11/jdk/ubuntu/Dockerfile.openj9.nightly.slim index 37bcc8f3a..51e281bba 100644 --- a/11/jdk/ubuntu/Dockerfile.openj9.nightly.slim +++ b/11/jdk/ubuntu/Dockerfile.openj9.nightly.slim @@ -34,21 +34,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f958278341855a5652b5d68922ad40acbe71eca4a713b32e2c6a203ae5d68037'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='d252a785076885e1094f97f5f338a6b28dc7eb97b87f461e9402a17380efe1eb'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='b9ed8871689e8ac185be4aa53bc5a3f87d4b84a836de1d4957a55f342c683ad9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='7196941b0587aa345ac0d936c20656b5ba86ea78fcc8c2e017cc1d700ed2b03a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='581f32e74b4847642d204743261df607b8a425d36df65ba5de43df35dcde1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f4790c53c1bd2129b633e57b22e4cca447253606d3dac18638a0ad0a14d04cae'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jdk_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='075557d3ccf5e8ae27cfeb51d6e6b6abeb0d62be28f5cdd68496a4ba7540e714'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jdk_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.openj9.releases.full b/11/jdk/ubuntu/Dockerfile.openj9.releases.full index cf9e2a949..2ede0f09c 100644 --- a/11/jdk/ubuntu/Dockerfile.openj9.releases.full +++ b/11/jdk/ubuntu/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/Dockerfile.openj9.releases.slim b/11/jdk/ubuntu/Dockerfile.openj9.releases.slim index 48e788eee..5a91310ef 100644 --- a/11/jdk/ubuntu/Dockerfile.openj9.releases.slim +++ b/11/jdk/ubuntu/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='19e76ec32f6dd6820b3e1043b8b30984edc69174ddbc72d1b22f490f245ef0e4'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='6bc30bfbcf689906e3961ba3fa3c183ba232fbf3ddb3206920e8dcddf5c0aae2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jdk/ubuntu/slim-java.sh b/11/jdk/ubuntu/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/ubuntu/slim-java.sh +++ b/11/jdk/ubuntu/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index 9e2bea7af..bf3ed2a37 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim b/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim index 1e967c7d3..bf3ed2a37 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index 18e7f3cbe..676917dfd 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/11/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -23,12 +23,12 @@ FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.zip ; \ - Write-Host ('Verifying sha256 (d92722551cb6ff9b8a63c12a92d7ccacfd4c17e9159f6c7eb427a3a776049af8) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'd92722551cb6ff9b8a63c12a92d7ccacfd4c17e9159f6c7eb427a3a776049af8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (36c08b0f41465b43c91abf9d4e13d063e01d670cbf448106a1c700786d89cfa8) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '36c08b0f41465b43c91abf9d4e13d063e01d670cbf448106a1c700786d89cfa8') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/ Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,14 +44,10 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-11" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-11", "/openjdk-11"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index 18ef65042..7a41bc6a1 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,35 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim b/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim index a089a0194..7a41bc6a1 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim +++ b/11/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim @@ -17,38 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1809/slim-java.sh b/11/jdk/windows/nanoserver-1809/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/windows/nanoserver-1809/slim-java.sh +++ b/11/jdk/windows/nanoserver-1809/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index f7a3ad3ad..addb17a12 100644 --- a/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim b/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim index c2a15f626..addb17a12 100644 --- a/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim +++ b/11/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '8ba5752c59846228646eafc7687c2d78c759d1c78d8d0e46e5585647cff5640f') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index 1966e3e68..f7a385ade 100644 --- a/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,35 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim b/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim index cc7456bab..f7a385ade 100644 --- a/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim +++ b/11/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim @@ -17,38 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f41c31625741eb2684ec1509dac14b2d1d31d2ec9bf7f0cb0994b40dbfd08084') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-1909/slim-java.sh b/11/jdk/windows/nanoserver-1909/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/windows/nanoserver-1909/slim-java.sh +++ b/11/jdk/windows/nanoserver-1909/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..14234cc61 --- /dev/null +++ b/11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..14234cc61 --- /dev/null +++ b/11/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..e0489a895 --- /dev/null +++ b/11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim b/11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim new file mode 100644 index 000000000..e0489a895 --- /dev/null +++ b/11/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-20h2/slim-java.sh b/11/jdk/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jdk/windows/nanoserver-20h2/slim-java.sh +++ b/11/jdk/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index 16eb9eb96..218008ae7 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index 866b5dfd3..3c7e5e8f9 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.msi ; \ - Write-Host ('Verifying sha256 (f12011de94a72e1f14c9e68ce63bdd537aab1bf51eb336eba6d6061bc307baeb) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f12011de94a72e1f14c9e68ce63bdd537aab1bf51eb336eba6d6061bc307baeb') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (36c08b0f41465b43c91abf9d4e13d063e01d670cbf448106a1c700786d89cfa8) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '36c08b0f41465b43c91abf9d4e13d063e01d670cbf448106a1c700786d89cfa8') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index 66b60e4ca..1dc6f1366 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index 882feba6b..c2944888b 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -22,29 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi ; \ - Write-Host ('Verifying sha256 (f0abd0ad0fcecb0afee310d19655db680b2758f015d26bbb28ca50eaf263b09c) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f0abd0ad0fcecb0afee310d19655db680b2758f015d26bbb28ca50eaf263b09c') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e566e899150eee684e26282c341d91cda34417b3b579a26fa8ccd7fd3780e430) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e566e899150eee684e26282c341d91cda34417b3b579a26fa8ccd7fd3780e430') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/11/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index 5b46fec6a..fa8cdb547 100644 --- a/11/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/11/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/11/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 2b63e80a9..1f518a75f 100644 --- a/11/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/11/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/11/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..ddea4b14d --- /dev/null +++ b/11/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/11/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..852e3ea54 --- /dev/null +++ b/11/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index ee42ee748..8bad8f3a5 100644 --- a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index 824b92ee2..e897a5964 100644 --- a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (f12011de94a72e1f14c9e68ce63bdd537aab1bf51eb336eba6d6061bc307baeb) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f12011de94a72e1f14c9e68ce63bdd537aab1bf51eb336eba6d6061bc307baeb') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (36c08b0f41465b43c91abf9d4e13d063e01d670cbf448106a1c700786d89cfa8) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '36c08b0f41465b43c91abf9d4e13d063e01d670cbf448106a1c700786d89cfa8') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index a5a870aa0..716861867 100644 --- a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index a493f215d..b743293bd 100644 --- a/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/11/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -22,29 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (f0abd0ad0fcecb0afee310d19655db680b2758f015d26bbb28ca50eaf263b09c) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f0abd0ad0fcecb0afee310d19655db680b2758f015d26bbb28ca50eaf263b09c') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e566e899150eee684e26282c341d91cda34417b3b579a26fa8ccd7fd3780e430) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e566e899150eee684e26282c341d91cda34417b3b579a26fa8ccd7fd3780e430') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index 74e8e7d93..475feb686 100644 --- a/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '11bb67a07786b299bb760337cd5646e8a6ed41558215fed9493acb52f3599340') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '65d3a5495c2943733908ebaeaede825158cb3ea041018a4054b709d06fe4f61a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 548b2c0da..a1cda619a 100644 --- a/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/11/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jdk_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '4dbc3ffd446b76b9173c3e0b5adacc7829a6e0710aef4ccdec88ee0ce1d129ac') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '01e0d270797f16decc54834a76cdc683ba6e1fa1c18a09bd6549797f84ffbed9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/11/jre/alpine/Dockerfile.hotspot.nightly.full b/11/jre/alpine/Dockerfile.hotspot.nightly.full index d9f0fd96d..f45b71533 100644 --- a/11/jre/alpine/Dockerfile.hotspot.nightly.full +++ b/11/jre/alpine/Dockerfile.hotspot.nightly.full @@ -60,25 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/alpine/Dockerfile.hotspot.releases.full b/11/jre/alpine/Dockerfile.hotspot.releases.full index ad03855c0..5531abc3d 100644 --- a/11/jre/alpine/Dockerfile.hotspot.releases.full +++ b/11/jre/alpine/Dockerfile.hotspot.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/alpine/Dockerfile.openj9.nightly.full b/11/jre/alpine/Dockerfile.openj9.nightly.full index 2a5cdd1e7..7f8317b57 100644 --- a/11/jre/alpine/Dockerfile.openj9.nightly.full +++ b/11/jre/alpine/Dockerfile.openj9.nightly.full @@ -60,21 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/alpine/Dockerfile.openj9.releases.full b/11/jre/alpine/Dockerfile.openj9.releases.full index 9a947e5ae..94398c341 100644 --- a/11/jre/alpine/Dockerfile.openj9.releases.full +++ b/11/jre/alpine/Dockerfile.openj9.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/centos/Dockerfile.hotspot.nightly.full b/11/jre/centos/Dockerfile.hotspot.nightly.full index 63f37890b..a1056f17a 100644 --- a/11/jre/centos/Dockerfile.hotspot.nightly.full +++ b/11/jre/centos/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='d4a04480ad0dd2da0db98dc391aa7a55a0cec34763e7f4bce18251c9ffaa185e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/centos/Dockerfile.hotspot.releases.full b/11/jre/centos/Dockerfile.hotspot.releases.full index ee65c9ad8..196677534 100644 --- a/11/jre/centos/Dockerfile.hotspot.releases.full +++ b/11/jre/centos/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/centos/Dockerfile.openj9.nightly.full b/11/jre/centos/Dockerfile.openj9.nightly.full index 4ebdcc72b..3a8795d79 100644 --- a/11/jre/centos/Dockerfile.openj9.nightly.full +++ b/11/jre/centos/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/centos/Dockerfile.openj9.releases.full b/11/jre/centos/Dockerfile.openj9.releases.full index 1fc5365c8..f7ed294d3 100644 --- a/11/jre/centos/Dockerfile.openj9.releases.full +++ b/11/jre/centos/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/clefos/Dockerfile.hotspot.nightly.full b/11/jre/clefos/Dockerfile.hotspot.nightly.full index b72465ad0..8725c2e75 100644 --- a/11/jre/clefos/Dockerfile.hotspot.nightly.full +++ b/11/jre/clefos/Dockerfile.hotspot.nightly.full @@ -29,25 +29,9 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/clefos/Dockerfile.hotspot.releases.full b/11/jre/clefos/Dockerfile.hotspot.releases.full index b8869403b..a23b54cbd 100644 --- a/11/jre/clefos/Dockerfile.hotspot.releases.full +++ b/11/jre/clefos/Dockerfile.hotspot.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/clefos/Dockerfile.openj9.nightly.full b/11/jre/clefos/Dockerfile.openj9.nightly.full index e457ccc67..a1248c26b 100644 --- a/11/jre/clefos/Dockerfile.openj9.nightly.full +++ b/11/jre/clefos/Dockerfile.openj9.nightly.full @@ -29,21 +29,9 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/clefos/Dockerfile.openj9.releases.full b/11/jre/clefos/Dockerfile.openj9.releases.full index 05cd5d12b..db6de11b4 100644 --- a/11/jre/clefos/Dockerfile.openj9.releases.full +++ b/11/jre/clefos/Dockerfile.openj9.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debian/Dockerfile.hotspot.nightly.full b/11/jre/debian/Dockerfile.hotspot.nightly.full index fef352d53..19823351f 100644 --- a/11/jre/debian/Dockerfile.hotspot.nightly.full +++ b/11/jre/debian/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='d4a04480ad0dd2da0db98dc391aa7a55a0cec34763e7f4bce18251c9ffaa185e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debian/Dockerfile.hotspot.releases.full b/11/jre/debian/Dockerfile.hotspot.releases.full index f58d251b7..8464b251b 100644 --- a/11/jre/debian/Dockerfile.hotspot.releases.full +++ b/11/jre/debian/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debian/Dockerfile.openj9.nightly.full b/11/jre/debian/Dockerfile.openj9.nightly.full index 185910813..3e6307c07 100644 --- a/11/jre/debian/Dockerfile.openj9.nightly.full +++ b/11/jre/debian/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debian/Dockerfile.openj9.releases.full b/11/jre/debian/Dockerfile.openj9.releases.full index 5333e42ac..0e64b9a77 100644 --- a/11/jre/debian/Dockerfile.openj9.releases.full +++ b/11/jre/debian/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debianslim/Dockerfile.hotspot.nightly.full b/11/jre/debianslim/Dockerfile.hotspot.nightly.full index a330425c1..97cb4c3d2 100644 --- a/11/jre/debianslim/Dockerfile.hotspot.nightly.full +++ b/11/jre/debianslim/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='d4a04480ad0dd2da0db98dc391aa7a55a0cec34763e7f4bce18251c9ffaa185e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debianslim/Dockerfile.hotspot.releases.full b/11/jre/debianslim/Dockerfile.hotspot.releases.full index 930e78233..621a513ce 100644 --- a/11/jre/debianslim/Dockerfile.hotspot.releases.full +++ b/11/jre/debianslim/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debianslim/Dockerfile.openj9.nightly.full b/11/jre/debianslim/Dockerfile.openj9.nightly.full index 2260ea661..25f34c52f 100644 --- a/11/jre/debianslim/Dockerfile.openj9.nightly.full +++ b/11/jre/debianslim/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/debianslim/Dockerfile.openj9.releases.full b/11/jre/debianslim/Dockerfile.openj9.releases.full index 02a92cbcc..c2276c486 100644 --- a/11/jre/debianslim/Dockerfile.openj9.releases.full +++ b/11/jre/debianslim/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/leap/Dockerfile.hotspot.nightly.full b/11/jre/leap/Dockerfile.hotspot.nightly.full index 39345859c..d32630d1c 100644 --- a/11/jre/leap/Dockerfile.hotspot.nightly.full +++ b/11/jre/leap/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='d4a04480ad0dd2da0db98dc391aa7a55a0cec34763e7f4bce18251c9ffaa185e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/leap/Dockerfile.hotspot.releases.full b/11/jre/leap/Dockerfile.hotspot.releases.full index e2d767eff..737cdeeeb 100644 --- a/11/jre/leap/Dockerfile.hotspot.releases.full +++ b/11/jre/leap/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/leap/Dockerfile.openj9.nightly.full b/11/jre/leap/Dockerfile.openj9.nightly.full index db9db123a..3c52b2945 100644 --- a/11/jre/leap/Dockerfile.openj9.nightly.full +++ b/11/jre/leap/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ - s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/leap/Dockerfile.openj9.releases.full b/11/jre/leap/Dockerfile.openj9.releases.full index 27d02ba02..16cec9f22 100644 --- a/11/jre/leap/Dockerfile.openj9.releases.full +++ b/11/jre/leap/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/tumbleweed/Dockerfile.hotspot.nightly.full b/11/jre/tumbleweed/Dockerfile.hotspot.nightly.full index a166040b5..85729ee91 100644 --- a/11/jre/tumbleweed/Dockerfile.hotspot.nightly.full +++ b/11/jre/tumbleweed/Dockerfile.hotspot.nightly.full @@ -30,24 +30,24 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='d4a04480ad0dd2da0db98dc391aa7a55a0cec34763e7f4bce18251c9ffaa185e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/tumbleweed/Dockerfile.hotspot.releases.full b/11/jre/tumbleweed/Dockerfile.hotspot.releases.full index f0bfae25d..53b86735f 100644 --- a/11/jre/tumbleweed/Dockerfile.hotspot.releases.full +++ b/11/jre/tumbleweed/Dockerfile.hotspot.releases.full @@ -24,30 +24,30 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/tumbleweed/Dockerfile.openj9.nightly.full b/11/jre/tumbleweed/Dockerfile.openj9.nightly.full index 757af7f79..4b0e4084f 100644 --- a/11/jre/tumbleweed/Dockerfile.openj9.nightly.full +++ b/11/jre/tumbleweed/Dockerfile.openj9.nightly.full @@ -29,21 +29,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/tumbleweed/Dockerfile.openj9.releases.full b/11/jre/tumbleweed/Dockerfile.openj9.releases.full index 8a676fe60..9a1860132 100644 --- a/11/jre/tumbleweed/Dockerfile.openj9.releases.full +++ b/11/jre/tumbleweed/Dockerfile.openj9.releases.full @@ -24,22 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi-minimal/Dockerfile.hotspot.nightly.full b/11/jre/ubi-minimal/Dockerfile.hotspot.nightly.full index 66a81351e..42d557340 100644 --- a/11/jre/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/11/jre/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi-minimal/Dockerfile.hotspot.releases.full b/11/jre/ubi-minimal/Dockerfile.hotspot.releases.full index 05624b37f..215a4fdfc 100644 --- a/11/jre/ubi-minimal/Dockerfile.hotspot.releases.full +++ b/11/jre/ubi-minimal/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9" \ + version="jdk-11.0.11+9" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi-minimal/Dockerfile.openj9.nightly.full b/11/jre/ubi-minimal/Dockerfile.openj9.nightly.full index 95930724e..7522bd226 100644 --- a/11/jre/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/11/jre/ubi-minimal/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi-minimal/Dockerfile.openj9.releases.full b/11/jre/ubi-minimal/Dockerfile.openj9.releases.full index 3adfc38f5..83e76b614 100644 --- a/11/jre/ubi-minimal/Dockerfile.openj9.releases.full +++ b/11/jre/ubi-minimal/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9_openj9-0.24.0" \ + version="jdk-11.0.11+9_openj9-0.26.0" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi/Dockerfile.hotspot.nightly.full b/11/jre/ubi/Dockerfile.hotspot.nightly.full index 22f5d201e..02f91f366 100644 --- a/11/jre/ubi/Dockerfile.hotspot.nightly.full +++ b/11/jre/ubi/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi/Dockerfile.hotspot.releases.full b/11/jre/ubi/Dockerfile.hotspot.releases.full index 8bedaca1c..41b180e6a 100644 --- a/11/jre/ubi/Dockerfile.hotspot.releases.full +++ b/11/jre/ubi/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9" \ + version="jdk-11.0.11+9" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi/Dockerfile.openj9.nightly.full b/11/jre/ubi/Dockerfile.openj9.nightly.full index ec61c91c8..ec427c623 100644 --- a/11/jre/ubi/Dockerfile.openj9.nightly.full +++ b/11/jre/ubi/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubi/Dockerfile.openj9.releases.full b/11/jre/ubi/Dockerfile.openj9.releases.full index 48a28b945..232523b16 100644 --- a/11/jre/ubi/Dockerfile.openj9.releases.full +++ b/11/jre/ubi/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-11.0.10+9_openj9-0.24.0" \ + version="jdk-11.0.11+9_openj9-0.26.0" \ release="11" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubuntu/Dockerfile.hotspot.nightly.full b/11/jre/ubuntu/Dockerfile.hotspot.nightly.full index f84a61ca1..e307d275d 100644 --- a/11/jre/ubuntu/Dockerfile.hotspot.nightly.full +++ b/11/jre/ubuntu/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='b741fd2d9eee97f39195d72ee11c3cc53360bd361890f34e37547c06915fd4d3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='72c9afe75b9f3d616ec72d0d28fa799894cc81e4e2bd96a6ab88561767002b06'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_aarch64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='7a4b472e0000bdaf68751e057c708fda2a08cf51f38cf168a5b5fa320c5253ea'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_arm_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='d4a04480ad0dd2da0db98dc391aa7a55a0cec34763e7f4bce18251c9ffaa185e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_arm_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='2c90d2ee69570d4c33bb464b8d3fb103ccc440a6e9071e4986fe320448950fe2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='460d924f603ddf61e9aa2a9dcfb65b01ac68eacd4f04b24bb11e7455527fa754'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='e671eb9534f9bfab13d9588007d4295b1ed062cd95b46282a2eb368ffb4ec38e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-01-27-13-56.tar.gz'; \ + ESUM='68ebcdcc7b306eac55c1bbddf4a6eb7a98ab607a35bf5c5da565ee7f05b4e1c9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7592d8027b4585246d166d3abf163ccc2db64564de2ad6d36a6fe5c98e0d49d6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_hotspot_2021-01-27-07-02.tar.gz'; \ + ESUM='4362ac2736f09020d0daeaec5505a56c4df2193f277d8f0da1d1966640069bff'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_hotspot_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubuntu/Dockerfile.hotspot.releases.full b/11/jre/ubuntu/Dockerfile.hotspot.releases.full index 033db23f7..bcbf2fd52 100644 --- a/11/jre/ubuntu/Dockerfile.hotspot.releases.full +++ b/11/jre/ubuntu/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d269b646af32eb41d74b3a5259f634921a063c67642ab5c227142463824b2a6d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2c9ec28b10bf1628b20a157c746988f323e0dcbf1053b616aa6593923e3a70df'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz'; \ + ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubuntu/Dockerfile.openj9.nightly.full b/11/jre/ubuntu/Dockerfile.openj9.nightly.full index 671b5969b..a31c17843 100644 --- a/11/jre/ubuntu/Dockerfile.openj9.nightly.full +++ b/11/jre/ubuntu/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk11u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='35fc89cae0bd22c5a675227e46ea77af48f49e09240705932235de7c36f51e09'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_aarch64_linux_openj9_2021-01-27-13-56.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='5f723102ac2e3bf3e384e99411e43dbbcca5216c22cbbedd5867b000fbefdf3e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='11cd80899134dc4555ceac259c521d7bc0072ce29a9907d84bf0acbd143c8b9a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_ppc64le_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ s390x) \ - ESUM='853277c413ff7bbf59029a73025e34b719e32ec24631e547ef4761614bded491'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_s390x_linux_openj9_2021-01-27-13-56.tar.gz'; \ + ESUM='3d44941d4c506c47f5f7905fb1d85dc389843a4ae8ee107d1a3bdce06ad35cc7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_s390x_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='25a33265b7ec7f4a53ecf7cd32d405ebae5733e0d0d4eaf982fc79b1b187999b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-07-02/OpenJDK11U-jre_x64_linux_openj9_2021-01-27-07-02.tar.gz'; \ + ESUM='1a0004477ece0dbe59ddc9a57aeb386735752756ef9fe4d9c9e9c4fe47a58fad'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-04-28-05-56/OpenJDK11U-jre_x64_linux_openj9_2021-04-28-05-56.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/ubuntu/Dockerfile.openj9.releases.full b/11/jre/ubuntu/Dockerfile.openj9.releases.full index e847a72d3..b07817ea7 100644 --- a/11/jre/ubuntu/Dockerfile.openj9.releases.full +++ b/11/jre/ubuntu/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='2ff9f50d6ffc345434703c43a1d67ac6d3d054b5d4925b4b73a3ce51b02940e5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='2d746296f743bdca55e3c391ddd5529c819e3b5193782085441c0078e1471406'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_s390x_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz'; \ + ESUM='152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index fdf7bfbf4..4bbe64fd7 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (98450bcc753919b5d60ec51b338d249f3fd0cbc6e73595a8a015647448eda461) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '98450bcc753919b5d60ec51b338d249f3fd0cbc6e73595a8a015647448eda461') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim b/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim index cf7b690fe..4bbe64fd7 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim +++ b/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim @@ -17,36 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (98450bcc753919b5d60ec51b338d249f3fd0cbc6e73595a8a015647448eda461) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '98450bcc753919b5d60ec51b338d249f3fd0cbc6e73595a8a015647448eda461') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index 358d033a4..3a77abd26 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/11/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -23,12 +23,12 @@ FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.10_9.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.10_9.zip ; \ - Write-Host ('Verifying sha256 (bab0d47f4764520a96890d00ef5f27d3eb350f77e8dd15e6adf560993fb12595) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'bab0d47f4764520a96890d00ef5f27d3eb350f77e8dd15e6adf560993fb12595') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (a7377fb0807fa619de49eec02ad7e2110c257649341f5ccffbaafa43cc8cbcc8) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'a7377fb0807fa619de49eec02ad7e2110c257649341f5ccffbaafa43cc8cbcc8') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/ Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,13 +44,9 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-11" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-11", "/openjdk-11"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" diff --git a/11/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/11/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index 9654cfe2b..076b36f12 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/11/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (e653c6f0e6f9b4c3f7485a01a8cfc11be8c08bb93aeac7d759c384427ec070d9) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e653c6f0e6f9b4c3f7485a01a8cfc11be8c08bb93aeac7d759c384427ec070d9') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/nanoserver-1809/slim-java.sh b/11/jre/windows/nanoserver-1809/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jre/windows/nanoserver-1809/slim-java.sh +++ b/11/jre/windows/nanoserver-1809/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/11/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index 18d1e3ff3..5d6eb741f 100644 --- a/11/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/11/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (98450bcc753919b5d60ec51b338d249f3fd0cbc6e73595a8a015647448eda461) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '98450bcc753919b5d60ec51b338d249f3fd0cbc6e73595a8a015647448eda461') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/11/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/11/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index 45fc25d85..997bdd725 100644 --- a/11/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/11/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk11u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (e653c6f0e6f9b4c3f7485a01a8cfc11be8c08bb93aeac7d759c384427ec070d9) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e653c6f0e6f9b4c3f7485a01a8cfc11be8c08bb93aeac7d759c384427ec070d9') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-11; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-11 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..19b0051df --- /dev/null +++ b/11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..19b0051df --- /dev/null +++ b/11/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/11/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..7ffc66eb0 --- /dev/null +++ b/11/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/nanoserver-20h2/slim-java.sh b/11/jre/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/11/jre/windows/nanoserver-20h2/slim-java.sh +++ b/11/jre/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index 802d17e4d..32a3f1d77 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index d760059b0..e1c0e0c70 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/11/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.10_9.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.10_9.msi ; \ - Write-Host ('Verifying sha256 (7965969a4cb913ecea276ef5e9e3bf7f145c23bd5bbdbddb9ec21384005c44fe) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7965969a4cb913ecea276ef5e9e3bf7f145c23bd5bbdbddb9ec21384005c44fe') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (a7377fb0807fa619de49eec02ad7e2110c257649341f5ccffbaafa43cc8cbcc8) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'a7377fb0807fa619de49eec02ad7e2110c257649341f5ccffbaafa43cc8cbcc8') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index 845d54d55..1722da445 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index 5d40f7046..de2338f39 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/11/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi ; \ - Write-Host ('Verifying sha256 (66bf50f000c1803a66ccd00ccb24dbfd18a69a14731e6eb8be48f9813a6cd841) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '66bf50f000c1803a66ccd00ccb24dbfd18a69a14731e6eb8be48f9813a6cd841') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5386843bd83855f141d20deaa452fffd47477ce9b4a84cac1c6ae05e7203446d) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5386843bd83855f141d20deaa452fffd47477ce9b4a84cac1c6ae05e7203446d') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/11/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index 26dea6eda..9ef089520 100644 --- a/11/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/11/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/11/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 5780ab532..20dd31f79 100644 --- a/11/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/11/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/11/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..c2df157f2 --- /dev/null +++ b/11/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,51 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/11/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..f3afea401 --- /dev/null +++ b/11/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk11u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index f73ba05d4..44bb388ad 100644 --- a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index 79c01d795..43db8a184 100644 --- a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9 +ENV JAVA_VERSION jdk-11.0.11+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.10_9.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.10_9.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (7965969a4cb913ecea276ef5e9e3bf7f145c23bd5bbdbddb9ec21384005c44fe) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7965969a4cb913ecea276ef5e9e3bf7f145c23bd5bbdbddb9ec21384005c44fe') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (a7377fb0807fa619de49eec02ad7e2110c257649341f5ccffbaafa43cc8cbcc8) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'a7377fb0807fa619de49eec02ad7e2110c257649341f5ccffbaafa43cc8cbcc8') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index bc209be21..2184228e4 100644 --- a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index 838146306..639e48ce8 100644 --- a/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/11/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.10+9_openj9-0.24.0 +ENV JAVA_VERSION jdk-11.0.11+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_windows_openj9_11.0.10_9_openj9-0.24.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (66bf50f000c1803a66ccd00ccb24dbfd18a69a14731e6eb8be48f9813a6cd841) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '66bf50f000c1803a66ccd00ccb24dbfd18a69a14731e6eb8be48f9813a6cd841') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5386843bd83855f141d20deaa452fffd47477ce9b4a84cac1c6ae05e7203446d) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5386843bd83855f141d20deaa452fffd47477ce9b4a84cac1c6ae05e7203446d') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index 9cdc7ac75..12e4ffd74 100644 --- a/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_hotspot_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '1d858ccec8f0a29b9ae225942c2a6356287803a54a549b2e015021f0ec0404a6') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '35004b55f325f99d49ce62640a51487323ef402c8b28fd404ca413595df09b21') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 5b23df532..0a33352e6 100644 --- a/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/11/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk11u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2021-01-27-13-56/OpenJDK11U-jre_x64_windows_openj9_2021-01-27-13-56.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '2a7866a3eef8768845ee21ed4cac07e3a51ba1efc7328265f2ebdfd8beef5875') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '559d67b2970fb6cf322a999dc55b141e5e252b511d60d1af076dfcb7230f12b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jdk/alpine/Dockerfile.hotspot.nightly.full b/15/jdk/alpine/Dockerfile.hotspot.nightly.full index 3226c9201..93efba525 100644 --- a/15/jdk/alpine/Dockerfile.hotspot.nightly.full +++ b/15/jdk/alpine/Dockerfile.hotspot.nightly.full @@ -60,22 +60,6 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - s390x) \ - ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/alpine/Dockerfile.hotspot.nightly.slim b/15/jdk/alpine/Dockerfile.hotspot.nightly.slim index 80328ca69..381b6d2cd 100644 --- a/15/jdk/alpine/Dockerfile.hotspot.nightly.slim +++ b/15/jdk/alpine/Dockerfile.hotspot.nightly.slim @@ -62,22 +62,6 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - s390x) \ - ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/alpine/Dockerfile.openj9.nightly.full b/15/jdk/alpine/Dockerfile.openj9.nightly.full index 6bf0a8c12..3bceef188 100644 --- a/15/jdk/alpine/Dockerfile.openj9.nightly.full +++ b/15/jdk/alpine/Dockerfile.openj9.nightly.full @@ -60,18 +60,6 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - s390x) \ - ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/alpine/Dockerfile.openj9.nightly.slim b/15/jdk/alpine/Dockerfile.openj9.nightly.slim index 0655418e0..4cccb20eb 100644 --- a/15/jdk/alpine/Dockerfile.openj9.nightly.slim +++ b/15/jdk/alpine/Dockerfile.openj9.nightly.slim @@ -62,18 +62,6 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - s390x) \ - ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/alpine/slim-java.sh b/15/jdk/alpine/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/alpine/slim-java.sh +++ b/15/jdk/alpine/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/centos/Dockerfile.hotspot.nightly.full b/15/jdk/centos/Dockerfile.hotspot.nightly.full index 7c8013d09..1bbc787fd 100644 --- a/15/jdk/centos/Dockerfile.hotspot.nightly.full +++ b/15/jdk/centos/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/centos/Dockerfile.hotspot.nightly.slim b/15/jdk/centos/Dockerfile.hotspot.nightly.slim index 781dae3e2..7182bdacb 100644 --- a/15/jdk/centos/Dockerfile.hotspot.nightly.slim +++ b/15/jdk/centos/Dockerfile.hotspot.nightly.slim @@ -43,10 +43,6 @@ RUN set -eux; \ ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/centos/Dockerfile.openj9.nightly.full b/15/jdk/centos/Dockerfile.openj9.nightly.full index de90b1366..a43b0fa67 100644 --- a/15/jdk/centos/Dockerfile.openj9.nightly.full +++ b/15/jdk/centos/Dockerfile.openj9.nightly.full @@ -29,18 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/centos/Dockerfile.openj9.nightly.slim b/15/jdk/centos/Dockerfile.openj9.nightly.slim index 071f7d51a..f676e47f2 100644 --- a/15/jdk/centos/Dockerfile.openj9.nightly.slim +++ b/15/jdk/centos/Dockerfile.openj9.nightly.slim @@ -31,18 +31,10 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/centos/slim-java.sh b/15/jdk/centos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/centos/slim-java.sh +++ b/15/jdk/centos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/clefos/Dockerfile.hotspot.nightly.full b/15/jdk/clefos/Dockerfile.hotspot.nightly.full index 817ca65c3..0143916e1 100644 --- a/15/jdk/clefos/Dockerfile.hotspot.nightly.full +++ b/15/jdk/clefos/Dockerfile.hotspot.nightly.full @@ -29,26 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ s390x) \ ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - amd64|x86_64) \ - ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ diff --git a/15/jdk/clefos/Dockerfile.hotspot.nightly.slim b/15/jdk/clefos/Dockerfile.hotspot.nightly.slim index 0a592227b..0db74dd95 100644 --- a/15/jdk/clefos/Dockerfile.hotspot.nightly.slim +++ b/15/jdk/clefos/Dockerfile.hotspot.nightly.slim @@ -31,26 +31,10 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ s390x) \ ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - amd64|x86_64) \ - ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ diff --git a/15/jdk/clefos/Dockerfile.openj9.nightly.full b/15/jdk/clefos/Dockerfile.openj9.nightly.full index 024e37c39..4a9e26775 100644 --- a/15/jdk/clefos/Dockerfile.openj9.nightly.full +++ b/15/jdk/clefos/Dockerfile.openj9.nightly.full @@ -29,22 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ s390x) \ ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - amd64|x86_64) \ - ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ diff --git a/15/jdk/clefos/Dockerfile.openj9.nightly.slim b/15/jdk/clefos/Dockerfile.openj9.nightly.slim index 8c58e1808..8c8acdc50 100644 --- a/15/jdk/clefos/Dockerfile.openj9.nightly.slim +++ b/15/jdk/clefos/Dockerfile.openj9.nightly.slim @@ -31,22 +31,10 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ s390x) \ ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - amd64|x86_64) \ - ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ diff --git a/15/jdk/clefos/slim-java.sh b/15/jdk/clefos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/clefos/slim-java.sh +++ b/15/jdk/clefos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/debian/Dockerfile.openj9.nightly.full b/15/jdk/debian/Dockerfile.openj9.nightly.full index 694789f0a..87226c555 100644 --- a/15/jdk/debian/Dockerfile.openj9.nightly.full +++ b/15/jdk/debian/Dockerfile.openj9.nightly.full @@ -32,10 +32,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/debian/Dockerfile.openj9.nightly.slim b/15/jdk/debian/Dockerfile.openj9.nightly.slim index 28966fdd3..05f627c96 100644 --- a/15/jdk/debian/Dockerfile.openj9.nightly.slim +++ b/15/jdk/debian/Dockerfile.openj9.nightly.slim @@ -34,10 +34,6 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/debian/slim-java.sh b/15/jdk/debian/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/debian/slim-java.sh +++ b/15/jdk/debian/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/debianslim/Dockerfile.openj9.nightly.full b/15/jdk/debianslim/Dockerfile.openj9.nightly.full index 322cd1639..3d5f40fa9 100644 --- a/15/jdk/debianslim/Dockerfile.openj9.nightly.full +++ b/15/jdk/debianslim/Dockerfile.openj9.nightly.full @@ -32,10 +32,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/debianslim/Dockerfile.openj9.nightly.slim b/15/jdk/debianslim/Dockerfile.openj9.nightly.slim index 520b866bc..5084dea79 100644 --- a/15/jdk/debianslim/Dockerfile.openj9.nightly.slim +++ b/15/jdk/debianslim/Dockerfile.openj9.nightly.slim @@ -34,10 +34,6 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/debianslim/slim-java.sh b/15/jdk/debianslim/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/debianslim/slim-java.sh +++ b/15/jdk/debianslim/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/leap/Dockerfile.hotspot.nightly.full b/15/jdk/leap/Dockerfile.hotspot.nightly.full index 98f44d797..01289db63 100644 --- a/15/jdk/leap/Dockerfile.hotspot.nightly.full +++ b/15/jdk/leap/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='cac293b2a8e74161c82b7f7eabcbb8ede36537941ef188e5f6d0c2624c4ef8ab'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='eee6ea48d0dccfdc6c229e6635776aa8245d8d11b69bbf470f30d92b5e8ac8b8'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/leap/Dockerfile.openj9.nightly.full b/15/jdk/leap/Dockerfile.openj9.nightly.full index ac6ee39e6..fa06db4c4 100644 --- a/15/jdk/leap/Dockerfile.openj9.nightly.full +++ b/15/jdk/leap/Dockerfile.openj9.nightly.full @@ -29,18 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='f6e006d19dbbc485755c02e9ca1a4c6153e6885021cdedb6037e90327c6776f6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='4693933d87b5c725499d7ae82356f84929b805fcedb170e165037ebf47172ca0'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/tumbleweed/Dockerfile.openj9.nightly.full b/15/jdk/tumbleweed/Dockerfile.openj9.nightly.full index 2c612542c..afdc56d55 100644 --- a/15/jdk/tumbleweed/Dockerfile.openj9.nightly.full +++ b/15/jdk/tumbleweed/Dockerfile.openj9.nightly.full @@ -29,10 +29,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full b/15/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full index 42d2f55eb..898d5c376 100644 --- a/15/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/15/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi-minimal/Dockerfile.openj9.nightly.full b/15/jdk/ubi-minimal/Dockerfile.openj9.nightly.full index edbce4fab..5d7ea66b8 100644 --- a/15/jdk/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/15/jdk/ubi-minimal/Dockerfile.openj9.nightly.full @@ -37,10 +37,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi/Dockerfile.hotspot.nightly.full b/15/jdk/ubi/Dockerfile.hotspot.nightly.full index 68aa2caed..607378f9e 100644 --- a/15/jdk/ubi/Dockerfile.hotspot.nightly.full +++ b/15/jdk/ubi/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi/Dockerfile.hotspot.nightly.slim b/15/jdk/ubi/Dockerfile.hotspot.nightly.slim index 378f83199..e770067b1 100644 --- a/15/jdk/ubi/Dockerfile.hotspot.nightly.slim +++ b/15/jdk/ubi/Dockerfile.hotspot.nightly.slim @@ -43,10 +43,6 @@ RUN set -eux; \ ESUM='9742e53597c71bf30af991c23047630d4d460e151bce1e3985b7ba8d37c28df3'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - armhf|armv7l) \ - ESUM='7f56429f6381be93c36fa0456945cd5b895cd6670c25ad9339844b6b982e0cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='b71ac40226c24936136873d7cef2b566035387bae532681c71d131421ca5976c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi/Dockerfile.openj9.nightly.full b/15/jdk/ubi/Dockerfile.openj9.nightly.full index 0c0ed6a19..c3deab959 100644 --- a/15/jdk/ubi/Dockerfile.openj9.nightly.full +++ b/15/jdk/ubi/Dockerfile.openj9.nightly.full @@ -37,10 +37,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi/Dockerfile.openj9.nightly.slim b/15/jdk/ubi/Dockerfile.openj9.nightly.slim index 8454c0fc0..d6bf8c03b 100644 --- a/15/jdk/ubi/Dockerfile.openj9.nightly.slim +++ b/15/jdk/ubi/Dockerfile.openj9.nightly.slim @@ -39,10 +39,6 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubi/slim-java.sh b/15/jdk/ubi/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/ubi/slim-java.sh +++ b/15/jdk/ubi/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/ubuntu/Dockerfile.openj9.nightly.full b/15/jdk/ubuntu/Dockerfile.openj9.nightly.full index e381778a6..ad67774c1 100644 --- a/15/jdk/ubuntu/Dockerfile.openj9.nightly.full +++ b/15/jdk/ubuntu/Dockerfile.openj9.nightly.full @@ -32,10 +32,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubuntu/Dockerfile.openj9.nightly.slim b/15/jdk/ubuntu/Dockerfile.openj9.nightly.slim index ffb9156a6..0ae433a47 100644 --- a/15/jdk/ubuntu/Dockerfile.openj9.nightly.slim +++ b/15/jdk/ubuntu/Dockerfile.openj9.nightly.slim @@ -34,10 +34,6 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='e0c7e5adf357b9aeb0401cb1abb645224220ed76b0cc1b15eece085a2295e2f3'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='f7a6adbb3e309eb38f9ceaf37c3815c20b122a798449e1089583d44db528e6c6'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jdk/ubuntu/slim-java.sh b/15/jdk/ubuntu/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/ubuntu/slim-java.sh +++ b/15/jdk/ubuntu/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index f5c9c9d11..1bbc8e115 100644 --- a/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ @@ -36,15 +34,20 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim b/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim index 75023a1fd..1bbc8e115 100644 --- a/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim +++ b/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim @@ -17,20 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ @@ -38,16 +34,20 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index b3b22d618..4e7e2f894 100644 --- a/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/15/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -25,8 +25,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip ; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741') { \ Write-Host 'FAILED!'; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,14 +44,10 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-15" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-15", "/openjdk-15"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index 6ae0c7d3d..e7ff6a8da 100644 --- a/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ @@ -36,16 +34,21 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim b/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim index e53da40c7..e7ff6a8da 100644 --- a/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim +++ b/15/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim @@ -17,20 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ @@ -38,17 +34,21 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1809/slim-java.sh b/15/jdk/windows/nanoserver-1809/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/windows/nanoserver-1809/slim-java.sh +++ b/15/jdk/windows/nanoserver-1809/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index b3085dcdf..911a1cc43 100644 --- a/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ @@ -36,15 +34,20 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim b/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim index bfbafaddd..911a1cc43 100644 --- a/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim +++ b/15/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim @@ -17,20 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ @@ -38,16 +34,20 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index 8b7e1ca97..043d60580 100644 --- a/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ @@ -36,16 +34,21 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim b/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim index 4312aeb1f..043d60580 100644 --- a/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim +++ b/15/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim @@ -17,20 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ @@ -38,17 +34,21 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-1909/slim-java.sh b/15/jdk/windows/nanoserver-1909/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/windows/nanoserver-1909/slim-java.sh +++ b/15/jdk/windows/nanoserver-1909/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..8a7981764 --- /dev/null +++ b/15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..8a7981764 --- /dev/null +++ b/15/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..1c9049fa6 --- /dev/null +++ b/15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim b/15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim new file mode 100644 index 000000000..1c9049fa6 --- /dev/null +++ b/15/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/15/jdk/windows/nanoserver-20h2/slim-java.sh b/15/jdk/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jdk/windows/nanoserver-20h2/slim-java.sh +++ b/15/jdk/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index 54756b655..46709e8c6 100644 --- a/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index e12041a7b..4c5879cb2 100644 --- a/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/15/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -24,26 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ; \ - Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index b010fca52..a58504eb5 100644 --- a/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index a9c572847..5aef37c3d 100644 --- a/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/15/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -24,27 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ; \ - Write-Host ('Verifying sha256 (f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (54f9f2bf34e951b1915985e3eb85a14fc0e302ddcd300f246160265d052aa067) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '54f9f2bf34e951b1915985e3eb85a14fc0e302ddcd300f246160265d052aa067') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/15/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index 036d70017..5624a8c93 100644 --- a/15/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/15/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/15/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 00ae9de19..467ea23b5 100644 --- a/15/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/15/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/15/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..2fafbbe13 --- /dev/null +++ b/15/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/15/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..e8ef32b75 --- /dev/null +++ b/15/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index 5d104544e..ac5a9636e 100644 --- a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index f5f5434e0..f41fe1d3a 100644 --- a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -24,26 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index 8335ce4c2..43dfa5032 100644 --- a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index 91143cb9c..10ce0f70a 100644 --- a/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/15/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -24,27 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (54f9f2bf34e951b1915985e3eb85a14fc0e302ddcd300f246160265d052aa067) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '54f9f2bf34e951b1915985e3eb85a14fc0e302ddcd300f246160265d052aa067') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index f3d75ec21..8218a9670 100644 --- a/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '45936bf7d1f8da16a9634b6ac42e90b4f1035503dc61925f493c03fdd59259a8') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 8211e2e46..e53fa0514 100644 --- a/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/15/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -24,22 +24,30 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5c8b286df13a80dff71afa3311be03e84ff6199a6ab339eaebe7d69b7983896d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/15/jre/alpine/Dockerfile.hotspot.nightly.full b/15/jre/alpine/Dockerfile.hotspot.nightly.full index 6abfe1c38..5bfb3051e 100644 --- a/15/jre/alpine/Dockerfile.hotspot.nightly.full +++ b/15/jre/alpine/Dockerfile.hotspot.nightly.full @@ -60,22 +60,6 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='8732552717f608cc7f2da0d17142e8d3d153fb818d3eadf8e04cc4fd24e9339f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='f611de9a822950b643a5660c0e1241656e1c3d9b65730a8dffeeffcd2b49f235'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='897f0e640d622367887cebe31cf6ae7279ffaccb690ad79ee7fd07b6885d9f17'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - s390x) \ - ESUM='0216c1a759ee37992156b3ae2e470e471656e9c859292229b6e5d4bdbc085fb2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='ad024b0aff2ae080bd6b42ec154ed140b43e63de24b09e3c36f44452fc4d28c2'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/alpine/Dockerfile.openj9.nightly.full b/15/jre/alpine/Dockerfile.openj9.nightly.full index affb81b68..1c64326d7 100644 --- a/15/jre/alpine/Dockerfile.openj9.nightly.full +++ b/15/jre/alpine/Dockerfile.openj9.nightly.full @@ -60,18 +60,6 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - s390x) \ - ESUM='4d04c35f360a26f2153e231a21bbd5b02d2c2e3cf03626a094515cfc75a9e2fa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='40d6d6c79e1987bccf2ab227735b2bcf79a8afba13338101499b4e75caa1012e'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/centos/Dockerfile.hotspot.nightly.full b/15/jre/centos/Dockerfile.hotspot.nightly.full index ec35e8912..2aa0ad572 100644 --- a/15/jre/centos/Dockerfile.hotspot.nightly.full +++ b/15/jre/centos/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='897f0e640d622367887cebe31cf6ae7279ffaccb690ad79ee7fd07b6885d9f17'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='0216c1a759ee37992156b3ae2e470e471656e9c859292229b6e5d4bdbc085fb2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='ad024b0aff2ae080bd6b42ec154ed140b43e63de24b09e3c36f44452fc4d28c2'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/centos/Dockerfile.openj9.nightly.full b/15/jre/centos/Dockerfile.openj9.nightly.full index 9035acba7..6ffd6d4bc 100644 --- a/15/jre/centos/Dockerfile.openj9.nightly.full +++ b/15/jre/centos/Dockerfile.openj9.nightly.full @@ -29,18 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='4d04c35f360a26f2153e231a21bbd5b02d2c2e3cf03626a094515cfc75a9e2fa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='40d6d6c79e1987bccf2ab227735b2bcf79a8afba13338101499b4e75caa1012e'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/clefos/Dockerfile.hotspot.nightly.full b/15/jre/clefos/Dockerfile.hotspot.nightly.full index 8a37ef52a..b12345bee 100644 --- a/15/jre/clefos/Dockerfile.hotspot.nightly.full +++ b/15/jre/clefos/Dockerfile.hotspot.nightly.full @@ -29,26 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='8732552717f608cc7f2da0d17142e8d3d153fb818d3eadf8e04cc4fd24e9339f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='f611de9a822950b643a5660c0e1241656e1c3d9b65730a8dffeeffcd2b49f235'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='897f0e640d622367887cebe31cf6ae7279ffaccb690ad79ee7fd07b6885d9f17'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ s390x) \ ESUM='0216c1a759ee37992156b3ae2e470e471656e9c859292229b6e5d4bdbc085fb2'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - amd64|x86_64) \ - ESUM='ad024b0aff2ae080bd6b42ec154ed140b43e63de24b09e3c36f44452fc4d28c2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ diff --git a/15/jre/clefos/Dockerfile.openj9.nightly.full b/15/jre/clefos/Dockerfile.openj9.nightly.full index ec9cf73b4..fba154f7c 100644 --- a/15/jre/clefos/Dockerfile.openj9.nightly.full +++ b/15/jre/clefos/Dockerfile.openj9.nightly.full @@ -29,22 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ s390x) \ ESUM='4d04c35f360a26f2153e231a21bbd5b02d2c2e3cf03626a094515cfc75a9e2fa'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - amd64|x86_64) \ - ESUM='40d6d6c79e1987bccf2ab227735b2bcf79a8afba13338101499b4e75caa1012e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ diff --git a/15/jre/debian/Dockerfile.openj9.nightly.full b/15/jre/debian/Dockerfile.openj9.nightly.full index c8e5d8054..96527404c 100644 --- a/15/jre/debian/Dockerfile.openj9.nightly.full +++ b/15/jre/debian/Dockerfile.openj9.nightly.full @@ -32,10 +32,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/debianslim/Dockerfile.openj9.nightly.full b/15/jre/debianslim/Dockerfile.openj9.nightly.full index 34b90f34b..3eb6d9922 100644 --- a/15/jre/debianslim/Dockerfile.openj9.nightly.full +++ b/15/jre/debianslim/Dockerfile.openj9.nightly.full @@ -32,10 +32,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/leap/Dockerfile.hotspot.nightly.full b/15/jre/leap/Dockerfile.hotspot.nightly.full index f13c6628d..cafdc01a7 100644 --- a/15/jre/leap/Dockerfile.hotspot.nightly.full +++ b/15/jre/leap/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='897f0e640d622367887cebe31cf6ae7279ffaccb690ad79ee7fd07b6885d9f17'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='0216c1a759ee37992156b3ae2e470e471656e9c859292229b6e5d4bdbc085fb2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='ad024b0aff2ae080bd6b42ec154ed140b43e63de24b09e3c36f44452fc4d28c2'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/leap/Dockerfile.openj9.nightly.full b/15/jre/leap/Dockerfile.openj9.nightly.full index eedf4bdc4..c8973d63c 100644 --- a/15/jre/leap/Dockerfile.openj9.nightly.full +++ b/15/jre/leap/Dockerfile.openj9.nightly.full @@ -29,18 +29,10 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ ;; \ - s390x) \ - ESUM='4d04c35f360a26f2153e231a21bbd5b02d2c2e3cf03626a094515cfc75a9e2fa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_s390x_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ amd64|x86_64) \ ESUM='40d6d6c79e1987bccf2ab227735b2bcf79a8afba13338101499b4e75caa1012e'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/tumbleweed/Dockerfile.openj9.nightly.full b/15/jre/tumbleweed/Dockerfile.openj9.nightly.full index 075d51190..906f07d6e 100644 --- a/15/jre/tumbleweed/Dockerfile.openj9.nightly.full +++ b/15/jre/tumbleweed/Dockerfile.openj9.nightly.full @@ -29,10 +29,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/ubi-minimal/Dockerfile.hotspot.nightly.full b/15/jre/ubi-minimal/Dockerfile.hotspot.nightly.full index 48cf153c4..585439ea3 100644 --- a/15/jre/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/15/jre/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='8732552717f608cc7f2da0d17142e8d3d153fb818d3eadf8e04cc4fd24e9339f'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - armhf|armv7l) \ - ESUM='f611de9a822950b643a5660c0e1241656e1c3d9b65730a8dffeeffcd2b49f235'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='897f0e640d622367887cebe31cf6ae7279ffaccb690ad79ee7fd07b6885d9f17'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/ubi-minimal/Dockerfile.openj9.nightly.full b/15/jre/ubi-minimal/Dockerfile.openj9.nightly.full index b73791960..87dbd0d72 100644 --- a/15/jre/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/15/jre/ubi-minimal/Dockerfile.openj9.nightly.full @@ -37,10 +37,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/ubi/Dockerfile.hotspot.nightly.full b/15/jre/ubi/Dockerfile.hotspot.nightly.full index d8e3f6635..7e7b76497 100644 --- a/15/jre/ubi/Dockerfile.hotspot.nightly.full +++ b/15/jre/ubi/Dockerfile.hotspot.nightly.full @@ -41,10 +41,6 @@ RUN set -eux; \ ESUM='8732552717f608cc7f2da0d17142e8d3d153fb818d3eadf8e04cc4fd24e9339f'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_hotspot_2021-01-22-02-31.tar.gz'; \ ;; \ - armhf|armv7l) \ - ESUM='f611de9a822950b643a5660c0e1241656e1c3d9b65730a8dffeeffcd2b49f235'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_arm_linux_hotspot_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='897f0e640d622367887cebe31cf6ae7279ffaccb690ad79ee7fd07b6885d9f17'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_hotspot_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/ubi/Dockerfile.openj9.nightly.full b/15/jre/ubi/Dockerfile.openj9.nightly.full index 1acae1bd2..645a24a42 100644 --- a/15/jre/ubi/Dockerfile.openj9.nightly.full +++ b/15/jre/ubi/Dockerfile.openj9.nightly.full @@ -37,10 +37,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/ubuntu/Dockerfile.openj9.nightly.full b/15/jre/ubuntu/Dockerfile.openj9.nightly.full index 8f2e56ee4..b8be9a86e 100644 --- a/15/jre/ubuntu/Dockerfile.openj9.nightly.full +++ b/15/jre/ubuntu/Dockerfile.openj9.nightly.full @@ -32,10 +32,6 @@ ENV JAVA_VERSION jdk15u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='fe7b278f23db03b9ab84baed1d69eb2b88e23b5c2add940cd5896b0f21e61cf1'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_aarch64_linux_openj9_2021-01-22-02-31.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ ESUM='05c34a6694c6bcee1c40d46dafe2548086375e87c443d4d000311eeb1181925c'; \ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_ppc64le_linux_openj9_2021-01-22-02-31.tar.gz'; \ diff --git a/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index 4f1dcd9a7..b68de40f2 100644 --- a/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ Write-Host 'FAILED!'; \ @@ -36,14 +34,19 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index 016b96c7c..c229304fe 100644 --- a/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/15/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -25,8 +25,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.zip ; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (d192e9a4ffeeaf5dbcd6cabe40588dcb806d3b315eec0a1361c7a2ec7867d80c) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'd192e9a4ffeeaf5dbcd6cabe40588dcb806d3b315eec0a1361c7a2ec7867d80c') { \ Write-Host 'FAILED!'; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,13 +44,9 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-15" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-15", "/openjdk-15"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" diff --git a/15/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/15/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index 88e3a7dc0..0d7f08251 100644 --- a/15/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/15/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ Write-Host 'FAILED!'; \ @@ -36,15 +34,20 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/15/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index be522194c..4a2743322 100644 --- a/15/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/15/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ Write-Host 'FAILED!'; \ @@ -36,14 +34,19 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/15/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/15/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index 65bdf9595..21a9ac1c9 100644 --- a/15/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/15/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,18 +17,16 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk15u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.zip -O 'openjdk.zip'; \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ Write-Host 'FAILED!'; \ @@ -36,15 +34,20 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-15; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-15 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..2cb73c602 --- /dev/null +++ b/15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..2cb73c602 --- /dev/null +++ b/15/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..d769612d9 --- /dev/null +++ b/15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim b/15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim new file mode 100644 index 000000000..d769612d9 --- /dev/null +++ b/15/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/nanoserver-20h2/slim-java.sh b/15/jre/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/15/jre/windows/nanoserver-20h2/slim-java.sh +++ b/15/jre/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index 82813a1d8..fed5e9715 100644 --- a/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index 993b42042..02db7dee7 100644 --- a/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/15/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -24,25 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.msi ; \ - Write-Host ('Verifying sha256 (e78fb1b0ccb6413d27dd9ed487f09af3bd0ba204208305c3b20e58607f45a019) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'e78fb1b0ccb6413d27dd9ed487f09af3bd0ba204208305c3b20e58607f45a019') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (d192e9a4ffeeaf5dbcd6cabe40588dcb806d3b315eec0a1361c7a2ec7867d80c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'd192e9a4ffeeaf5dbcd6cabe40588dcb806d3b315eec0a1361c7a2ec7867d80c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index 8196a1174..04dd40f2d 100644 --- a/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index a5b4a153c..566eccd0f 100644 --- a/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/15/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -24,26 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ; \ - Write-Host ('Verifying sha256 (8c3899f4f3dfbad444742b00276fd5ce53cdc8c4facb586cdab1834a41c1b71d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8c3899f4f3dfbad444742b00276fd5ce53cdc8c4facb586cdab1834a41c1b71d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5592ca45a817bd3ab0c5bde1186e79895a00e9589939243099605567e8b08f50) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5592ca45a817bd3ab0c5bde1186e79895a00e9589939243099605567e8b08f50') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/15/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index a7657dd33..5dd75aeb5 100644 --- a/15/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/15/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/15/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 035c733db..ba6b2a457 100644 --- a/15/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/15/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/15/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..7e534ca74 --- /dev/null +++ b/15/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,51 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/15/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..7a9dffcce --- /dev/null +++ b/15/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk15u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index ac801a70a..1ca4f731b 100644 --- a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index b96ed0726..55fa3a877 100644 --- a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -24,25 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (e78fb1b0ccb6413d27dd9ed487f09af3bd0ba204208305c3b20e58607f45a019) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'e78fb1b0ccb6413d27dd9ed487f09af3bd0ba204208305c3b20e58607f45a019') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (d192e9a4ffeeaf5dbcd6cabe40588dcb806d3b315eec0a1361c7a2ec7867d80c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'd192e9a4ffeeaf5dbcd6cabe40588dcb806d3b315eec0a1361c7a2ec7867d80c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index b7eb37491..45e026b08 100644 --- a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index ecacd34cd..b61ff531a 100644 --- a/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/15/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -24,26 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (8c3899f4f3dfbad444742b00276fd5ce53cdc8c4facb586cdab1834a41c1b71d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8c3899f4f3dfbad444742b00276fd5ce53cdc8c4facb586cdab1834a41c1b71d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5592ca45a817bd3ab0c5bde1186e79895a00e9589939243099605567e8b08f50) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5592ca45a817bd3ab0c5bde1186e79895a00e9589939243099605567e8b08f50') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index c41be4b97..eda0fbe46 100644 --- a/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '58b18854f7de9284b3b8efaff5933b5b4988d9a4dcaea95bcd3a0e3e2ce4787d') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 85ec50ecd..c906615db 100644 --- a/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/15/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk15u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'c31fb4fd82c149e5303cb632d451d137112527adae7a9a5b21ec211ea3c657d3') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jdk/alpine/Dockerfile.hotspot.nightly.full b/16/jdk/alpine/Dockerfile.hotspot.nightly.full index debafa9a3..1e3999cd4 100644 --- a/16/jdk/alpine/Dockerfile.hotspot.nightly.full +++ b/16/jdk/alpine/Dockerfile.hotspot.nightly.full @@ -21,64 +21,18 @@ FROM alpine:3.12 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ - && GLIBC_VER="2.31-r0" \ - && ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \ - && GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.1.0-2-x86_64.pkg.tar.zst" \ - && GCC_LIBS_SHA256="f80320a03ff73e82271064e4f684cd58d7dbdb07aa06a2c4eea8e0f3c507c45c" \ - && ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-3-x86_64.pkg.tar.xz" \ - && ZLIB_SHA256=17aede0b9f8baa789c5aa3f358fbf8c68a5f1228c5e6cba1a5dd34102ef4d4e5 \ - && curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \ - && SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \ - && echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \ - && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk \ - && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk \ - && curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk \ - && /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \ - && echo "export LANG=$LANG" > /etc/profile.d/locale.sh \ - && curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst \ - && echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - \ - && mkdir /tmp/gcc \ - && zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp \ - && tar -xf /tmp/gcc-libs.tar -C /tmp/gcc \ - && mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib \ - && strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so* \ - && curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz \ - && echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - \ - && mkdir /tmp/libz \ - && tar -xf /tmp/libz.tar.xz -C /tmp/libz \ - && mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \ - && apk del --purge .build-deps glibc-i18n \ - && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* +RUN apk add --no-cache tzdata musl-locales musl-locales-lang \ + && rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='43c6f6eca977f1f75bba4230e75aded68d05aaf4b1668e8c33a219c0b33c35ef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_alpine-linux_hotspot_2021-04-26-23-35.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.hotspot.nightly.slim b/16/jdk/alpine/Dockerfile.hotspot.nightly.slim index 67e697cf7..dfc424f22 100644 --- a/16/jdk/alpine/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/alpine/Dockerfile.hotspot.nightly.slim @@ -21,40 +21,10 @@ FROM alpine:3.12 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ - && GLIBC_VER="2.31-r0" \ - && ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \ - && GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.1.0-2-x86_64.pkg.tar.zst" \ - && GCC_LIBS_SHA256="f80320a03ff73e82271064e4f684cd58d7dbdb07aa06a2c4eea8e0f3c507c45c" \ - && ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-3-x86_64.pkg.tar.xz" \ - && ZLIB_SHA256=17aede0b9f8baa789c5aa3f358fbf8c68a5f1228c5e6cba1a5dd34102ef4d4e5 \ - && curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \ - && SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \ - && echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \ - && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk \ - && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk \ - && curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk \ - && /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \ - && echo "export LANG=$LANG" > /etc/profile.d/locale.sh \ - && curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst \ - && echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - \ - && mkdir /tmp/gcc \ - && zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp \ - && tar -xf /tmp/gcc-libs.tar -C /tmp/gcc \ - && mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib \ - && strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so* \ - && curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz \ - && echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - \ - && mkdir /tmp/libz \ - && tar -xf /tmp/libz.tar.xz -C /tmp/libz \ - && mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \ - && apk del --purge .build-deps glibc-i18n \ - && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* +RUN apk add --no-cache tzdata musl-locales musl-locales-lang \ + && rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -62,25 +32,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='43c6f6eca977f1f75bba4230e75aded68d05aaf4b1668e8c33a219c0b33c35ef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_alpine-linux_hotspot_2021-04-26-23-35.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.hotspot.releases.full b/16/jdk/alpine/Dockerfile.hotspot.releases.full index 953451c93..0db9ec905 100644 --- a/16/jdk/alpine/Dockerfile.hotspot.releases.full +++ b/16/jdk/alpine/Dockerfile.hotspot.releases.full @@ -24,15 +24,15 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN apk add --no-cache tzdata musl-locales musl-locales-lang \ && rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='588c2bc69e3007663308f3913819edeb552ea186c4069b8b59341d742d98ae38'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_alpine-linux_hotspot_16_36.tar.gz'; \ + ESUM='6a3e93ca05ea9c4062e8086baea68101748c5a1b433c7aac0cac48b4a7a7f2c7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.hotspot.releases.slim b/16/jdk/alpine/Dockerfile.hotspot.releases.slim index 497e5a985..bd4882660 100644 --- a/16/jdk/alpine/Dockerfile.hotspot.releases.slim +++ b/16/jdk/alpine/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN apk add --no-cache tzdata musl-locales musl-locales-lang \ && rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -33,8 +33,8 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='588c2bc69e3007663308f3913819edeb552ea186c4069b8b59341d742d98ae38'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_alpine-linux_hotspot_16_36.tar.gz'; \ + ESUM='6a3e93ca05ea9c4062e8086baea68101748c5a1b433c7aac0cac48b4a7a7f2c7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.openj9.nightly.full b/16/jdk/alpine/Dockerfile.openj9.nightly.full index 8d7744ece..516be4d77 100644 --- a/16/jdk/alpine/Dockerfile.openj9.nightly.full +++ b/16/jdk/alpine/Dockerfile.openj9.nightly.full @@ -54,27 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.openj9.nightly.slim b/16/jdk/alpine/Dockerfile.openj9.nightly.slim index 7bdf90813..645215581 100644 --- a/16/jdk/alpine/Dockerfile.openj9.nightly.slim +++ b/16/jdk/alpine/Dockerfile.openj9.nightly.slim @@ -54,7 +54,7 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -62,21 +62,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.openj9.releases.full b/16/jdk/alpine/Dockerfile.openj9.releases.full index fd5f9c287..b793d4fc1 100644 --- a/16/jdk/alpine/Dockerfile.openj9.releases.full +++ b/16/jdk/alpine/Dockerfile.openj9.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/Dockerfile.openj9.releases.slim b/16/jdk/alpine/Dockerfile.openj9.releases.slim index 2c1d89b37..478819456 100644 --- a/16/jdk/alpine/Dockerfile.openj9.releases.slim +++ b/16/jdk/alpine/Dockerfile.openj9.releases.slim @@ -54,7 +54,7 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -63,8 +63,8 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/alpine/slim-java.sh b/16/jdk/alpine/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/alpine/slim-java.sh +++ b/16/jdk/alpine/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/centos/Dockerfile.hotspot.nightly.full b/16/jdk/centos/Dockerfile.hotspot.nightly.full index fb70678c2..fe1fa6528 100644 --- a/16/jdk/centos/Dockerfile.hotspot.nightly.full +++ b/16/jdk/centos/Dockerfile.hotspot.nightly.full @@ -24,30 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.hotspot.nightly.slim b/16/jdk/centos/Dockerfile.hotspot.nightly.slim index 5d93e54b2..28efbcf14 100644 --- a/16/jdk/centos/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/centos/Dockerfile.hotspot.nightly.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -32,24 +32,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.hotspot.releases.full b/16/jdk/centos/Dockerfile.hotspot.releases.full index 1d8d6a98f..5c0658e55 100644 --- a/16/jdk/centos/Dockerfile.hotspot.releases.full +++ b/16/jdk/centos/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.hotspot.releases.slim b/16/jdk/centos/Dockerfile.hotspot.releases.slim index 7b5dd73c1..a0ff5e5ad 100644 --- a/16/jdk/centos/Dockerfile.hotspot.releases.slim +++ b/16/jdk/centos/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -32,20 +32,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.openj9.nightly.full b/16/jdk/centos/Dockerfile.openj9.nightly.full index 9614b8016..bc8d3282b 100644 --- a/16/jdk/centos/Dockerfile.openj9.nightly.full +++ b/16/jdk/centos/Dockerfile.openj9.nightly.full @@ -24,26 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.openj9.nightly.slim b/16/jdk/centos/Dockerfile.openj9.nightly.slim index a240a5eae..41899f9a0 100644 --- a/16/jdk/centos/Dockerfile.openj9.nightly.slim +++ b/16/jdk/centos/Dockerfile.openj9.nightly.slim @@ -24,28 +24,20 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.openj9.releases.full b/16/jdk/centos/Dockerfile.openj9.releases.full index c50232ebb..a6fe7211d 100644 --- a/16/jdk/centos/Dockerfile.openj9.releases.full +++ b/16/jdk/centos/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/Dockerfile.openj9.releases.slim b/16/jdk/centos/Dockerfile.openj9.releases.slim index 345f6ef06..34a1cfc82 100644 --- a/16/jdk/centos/Dockerfile.openj9.releases.slim +++ b/16/jdk/centos/Dockerfile.openj9.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -32,12 +32,12 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/centos/slim-java.sh b/16/jdk/centos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/centos/slim-java.sh +++ b/16/jdk/centos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/clefos/Dockerfile.hotspot.nightly.full b/16/jdk/clefos/Dockerfile.hotspot.nightly.full index a83e8f418..bbc0ef811 100644 --- a/16/jdk/clefos/Dockerfile.hotspot.nightly.full +++ b/16/jdk/clefos/Dockerfile.hotspot.nightly.full @@ -24,30 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.hotspot.nightly.slim b/16/jdk/clefos/Dockerfile.hotspot.nightly.slim index 8d9979896..24ff61f52 100644 --- a/16/jdk/clefos/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/clefos/Dockerfile.hotspot.nightly.slim @@ -24,32 +24,16 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.hotspot.releases.full b/16/jdk/clefos/Dockerfile.hotspot.releases.full index 218e62c22..35a6c9fdf 100644 --- a/16/jdk/clefos/Dockerfile.hotspot.releases.full +++ b/16/jdk/clefos/Dockerfile.hotspot.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.hotspot.releases.slim b/16/jdk/clefos/Dockerfile.hotspot.releases.slim index 4223f8040..2e498f85e 100644 --- a/16/jdk/clefos/Dockerfile.hotspot.releases.slim +++ b/16/jdk/clefos/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -32,8 +32,8 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.openj9.nightly.full b/16/jdk/clefos/Dockerfile.openj9.nightly.full index 3172dc1b7..641362335 100644 --- a/16/jdk/clefos/Dockerfile.openj9.nightly.full +++ b/16/jdk/clefos/Dockerfile.openj9.nightly.full @@ -24,26 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.openj9.nightly.slim b/16/jdk/clefos/Dockerfile.openj9.nightly.slim index 6d1ba790f..81e92edcc 100644 --- a/16/jdk/clefos/Dockerfile.openj9.nightly.slim +++ b/16/jdk/clefos/Dockerfile.openj9.nightly.slim @@ -24,28 +24,16 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.openj9.releases.full b/16/jdk/clefos/Dockerfile.openj9.releases.full index 7eb80f4cb..261178777 100644 --- a/16/jdk/clefos/Dockerfile.openj9.releases.full +++ b/16/jdk/clefos/Dockerfile.openj9.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/Dockerfile.openj9.releases.slim b/16/jdk/clefos/Dockerfile.openj9.releases.slim index 3096d16a4..2a06ecf0f 100644 --- a/16/jdk/clefos/Dockerfile.openj9.releases.slim +++ b/16/jdk/clefos/Dockerfile.openj9.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -32,8 +32,8 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/clefos/slim-java.sh b/16/jdk/clefos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/clefos/slim-java.sh +++ b/16/jdk/clefos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/debian/Dockerfile.hotspot.nightly.full b/16/jdk/debian/Dockerfile.hotspot.nightly.full index e555cff7c..e811f1292 100644 --- a/16/jdk/debian/Dockerfile.hotspot.nightly.full +++ b/16/jdk/debian/Dockerfile.hotspot.nightly.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.hotspot.nightly.slim b/16/jdk/debian/Dockerfile.hotspot.nightly.slim index 4d8f97570..e0e4259a0 100644 --- a/16/jdk/debian/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/debian/Dockerfile.hotspot.nightly.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.hotspot.releases.full b/16/jdk/debian/Dockerfile.hotspot.releases.full index 1de4ca357..59fbc464d 100644 --- a/16/jdk/debian/Dockerfile.hotspot.releases.full +++ b/16/jdk/debian/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.hotspot.releases.slim b/16/jdk/debian/Dockerfile.hotspot.releases.slim index 0a604644c..cb017d04b 100644 --- a/16/jdk/debian/Dockerfile.hotspot.releases.slim +++ b/16/jdk/debian/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.openj9.nightly.full b/16/jdk/debian/Dockerfile.openj9.nightly.full index 829d3be14..f86329c94 100644 --- a/16/jdk/debian/Dockerfile.openj9.nightly.full +++ b/16/jdk/debian/Dockerfile.openj9.nightly.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.openj9.nightly.slim b/16/jdk/debian/Dockerfile.openj9.nightly.slim index 9660f1c09..c1261ab50 100644 --- a/16/jdk/debian/Dockerfile.openj9.nightly.slim +++ b/16/jdk/debian/Dockerfile.openj9.nightly.slim @@ -27,28 +27,24 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.openj9.releases.full b/16/jdk/debian/Dockerfile.openj9.releases.full index c65f17723..007220534 100644 --- a/16/jdk/debian/Dockerfile.openj9.releases.full +++ b/16/jdk/debian/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/Dockerfile.openj9.releases.slim b/16/jdk/debian/Dockerfile.openj9.releases.slim index 179193980..295cd7bc8 100644 --- a/16/jdk/debian/Dockerfile.openj9.releases.slim +++ b/16/jdk/debian/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debian/slim-java.sh b/16/jdk/debian/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/debian/slim-java.sh +++ b/16/jdk/debian/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/debianslim/Dockerfile.hotspot.nightly.full b/16/jdk/debianslim/Dockerfile.hotspot.nightly.full index 8e913e550..48a08cbcb 100644 --- a/16/jdk/debianslim/Dockerfile.hotspot.nightly.full +++ b/16/jdk/debianslim/Dockerfile.hotspot.nightly.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.hotspot.nightly.slim b/16/jdk/debianslim/Dockerfile.hotspot.nightly.slim index 8c62a4687..8b81b036e 100644 --- a/16/jdk/debianslim/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/debianslim/Dockerfile.hotspot.nightly.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.hotspot.releases.full b/16/jdk/debianslim/Dockerfile.hotspot.releases.full index 1bc1516b6..58b907fd8 100644 --- a/16/jdk/debianslim/Dockerfile.hotspot.releases.full +++ b/16/jdk/debianslim/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.hotspot.releases.slim b/16/jdk/debianslim/Dockerfile.hotspot.releases.slim index a0686d2ce..6e7af9f74 100644 --- a/16/jdk/debianslim/Dockerfile.hotspot.releases.slim +++ b/16/jdk/debianslim/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.openj9.nightly.full b/16/jdk/debianslim/Dockerfile.openj9.nightly.full index 28ebba2e9..0d0d8b489 100644 --- a/16/jdk/debianslim/Dockerfile.openj9.nightly.full +++ b/16/jdk/debianslim/Dockerfile.openj9.nightly.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.openj9.nightly.slim b/16/jdk/debianslim/Dockerfile.openj9.nightly.slim index db7485b3e..de21dd11e 100644 --- a/16/jdk/debianslim/Dockerfile.openj9.nightly.slim +++ b/16/jdk/debianslim/Dockerfile.openj9.nightly.slim @@ -27,28 +27,24 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.openj9.releases.full b/16/jdk/debianslim/Dockerfile.openj9.releases.full index ce9e30c19..6dac810a4 100644 --- a/16/jdk/debianslim/Dockerfile.openj9.releases.full +++ b/16/jdk/debianslim/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/Dockerfile.openj9.releases.slim b/16/jdk/debianslim/Dockerfile.openj9.releases.slim index e4e3406f1..3b749174a 100644 --- a/16/jdk/debianslim/Dockerfile.openj9.releases.slim +++ b/16/jdk/debianslim/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/debianslim/slim-java.sh b/16/jdk/debianslim/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/debianslim/slim-java.sh +++ b/16/jdk/debianslim/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/leap/Dockerfile.hotspot.nightly.full b/16/jdk/leap/Dockerfile.hotspot.nightly.full index 633e56496..d1d326cdd 100644 --- a/16/jdk/leap/Dockerfile.hotspot.nightly.full +++ b/16/jdk/leap/Dockerfile.hotspot.nightly.full @@ -24,30 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/leap/Dockerfile.hotspot.releases.full b/16/jdk/leap/Dockerfile.hotspot.releases.full index 48dde08e3..3a8b34f60 100644 --- a/16/jdk/leap/Dockerfile.hotspot.releases.full +++ b/16/jdk/leap/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/leap/Dockerfile.openj9.nightly.full b/16/jdk/leap/Dockerfile.openj9.nightly.full index 8f8fcf080..e22350c81 100644 --- a/16/jdk/leap/Dockerfile.openj9.nightly.full +++ b/16/jdk/leap/Dockerfile.openj9.nightly.full @@ -24,26 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/leap/Dockerfile.openj9.releases.full b/16/jdk/leap/Dockerfile.openj9.releases.full index 7f410a951..935ad4889 100644 --- a/16/jdk/leap/Dockerfile.openj9.releases.full +++ b/16/jdk/leap/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/tumbleweed/Dockerfile.hotspot.nightly.full b/16/jdk/tumbleweed/Dockerfile.hotspot.nightly.full index 514ec4150..238a2967e 100644 --- a/16/jdk/tumbleweed/Dockerfile.hotspot.nightly.full +++ b/16/jdk/tumbleweed/Dockerfile.hotspot.nightly.full @@ -24,30 +24,30 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/tumbleweed/Dockerfile.hotspot.releases.full b/16/jdk/tumbleweed/Dockerfile.hotspot.releases.full index bddbef706..17640b799 100644 --- a/16/jdk/tumbleweed/Dockerfile.hotspot.releases.full +++ b/16/jdk/tumbleweed/Dockerfile.hotspot.releases.full @@ -24,30 +24,30 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/tumbleweed/Dockerfile.openj9.nightly.full b/16/jdk/tumbleweed/Dockerfile.openj9.nightly.full index e87753757..cf5b1a55f 100644 --- a/16/jdk/tumbleweed/Dockerfile.openj9.nightly.full +++ b/16/jdk/tumbleweed/Dockerfile.openj9.nightly.full @@ -24,26 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/tumbleweed/Dockerfile.openj9.releases.full b/16/jdk/tumbleweed/Dockerfile.openj9.releases.full index 2b233f082..39d2bf11c 100644 --- a/16/jdk/tumbleweed/Dockerfile.openj9.releases.full +++ b/16/jdk/tumbleweed/Dockerfile.openj9.releases.full @@ -24,22 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full b/16/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full index 91bb074ee..454de7fad 100644 --- a/16/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/16/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -26,36 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi-minimal/Dockerfile.hotspot.releases.full b/16/jdk/ubi-minimal/Dockerfile.hotspot.releases.full index d79ef946f..19df82864 100644 --- a/16/jdk/ubi-minimal/Dockerfile.hotspot.releases.full +++ b/16/jdk/ubi-minimal/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36" \ + version="jdk-16.0.1+9" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi-minimal/Dockerfile.openj9.nightly.full b/16/jdk/ubi-minimal/Dockerfile.openj9.nightly.full index 2b32b6997..01d49137e 100644 --- a/16/jdk/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/16/jdk/ubi-minimal/Dockerfile.openj9.nightly.full @@ -26,32 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi-minimal/Dockerfile.openj9.releases.full b/16/jdk/ubi-minimal/Dockerfile.openj9.releases.full index c3a2ec907..a38964e30 100644 --- a/16/jdk/ubi-minimal/Dockerfile.openj9.releases.full +++ b/16/jdk/ubi-minimal/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36_openj9-0.25.0" \ + version="jdk-16.0.1+9_openj9-0.26.0" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.hotspot.nightly.full b/16/jdk/ubi/Dockerfile.hotspot.nightly.full index 4ec74718d..02a26e794 100644 --- a/16/jdk/ubi/Dockerfile.hotspot.nightly.full +++ b/16/jdk/ubi/Dockerfile.hotspot.nightly.full @@ -26,36 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.hotspot.nightly.slim b/16/jdk/ubi/Dockerfile.hotspot.nightly.slim index de9d92827..edd471246 100644 --- a/16/jdk/ubi/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/ubi/Dockerfile.hotspot.nightly.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -40,24 +40,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.hotspot.releases.full b/16/jdk/ubi/Dockerfile.hotspot.releases.full index 0d86fdc2c..3c6ca89b5 100644 --- a/16/jdk/ubi/Dockerfile.hotspot.releases.full +++ b/16/jdk/ubi/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36" \ + version="jdk-16.0.1+9" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.hotspot.releases.slim b/16/jdk/ubi/Dockerfile.hotspot.releases.slim index c9f280bbd..bf90decb0 100644 --- a/16/jdk/ubi/Dockerfile.hotspot.releases.slim +++ b/16/jdk/ubi/Dockerfile.hotspot.releases.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36" \ + version="jdk-16.0.1+9" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -40,20 +40,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.openj9.nightly.full b/16/jdk/ubi/Dockerfile.openj9.nightly.full index 950301b4c..b9bef3044 100644 --- a/16/jdk/ubi/Dockerfile.openj9.nightly.full +++ b/16/jdk/ubi/Dockerfile.openj9.nightly.full @@ -26,32 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.openj9.nightly.slim b/16/jdk/ubi/Dockerfile.openj9.nightly.slim index 91d9c351f..59200be88 100644 --- a/16/jdk/ubi/Dockerfile.openj9.nightly.slim +++ b/16/jdk/ubi/Dockerfile.openj9.nightly.slim @@ -26,34 +26,30 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.openj9.releases.full b/16/jdk/ubi/Dockerfile.openj9.releases.full index aa223e299..02d95a358 100644 --- a/16/jdk/ubi/Dockerfile.openj9.releases.full +++ b/16/jdk/ubi/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36_openj9-0.25.0" \ + version="jdk-16.0.1+9_openj9-0.26.0" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/Dockerfile.openj9.releases.slim b/16/jdk/ubi/Dockerfile.openj9.releases.slim index bcc9ececf..9c36518d4 100644 --- a/16/jdk/ubi/Dockerfile.openj9.releases.slim +++ b/16/jdk/ubi/Dockerfile.openj9.releases.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36_openj9-0.25.0" \ + version="jdk-16.0.1+9_openj9-0.26.0" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -40,16 +40,16 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubi/slim-java.sh b/16/jdk/ubi/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/ubi/slim-java.sh +++ b/16/jdk/ubi/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/ubuntu/Dockerfile.hotspot.nightly.full b/16/jdk/ubuntu/Dockerfile.hotspot.nightly.full index d769d7e5b..a62ca2281 100644 --- a/16/jdk/ubuntu/Dockerfile.hotspot.nightly.full +++ b/16/jdk/ubuntu/Dockerfile.hotspot.nightly.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.hotspot.nightly.slim b/16/jdk/ubuntu/Dockerfile.hotspot.nightly.slim index e7ee66bc0..0bac08510 100644 --- a/16/jdk/ubuntu/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/ubuntu/Dockerfile.hotspot.nightly.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='f5a4711ee850011bffbaf1d92419616723e484ddf72943921266aa01851ac70a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6d2eed8be0a62e14b47bce26bf9cccaeeed22767de457316cf8aa04b0133a1db'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='6e67a04983efe9bdfd5c2e0c0a1b6536d6a88ac9f505e45b8192729e6950c649'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='fe8bbf8eb4b48f689e1d87e8395e94ae590bc661c8e7350f408e8a2b53a79152'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='897dfcd60b10551d8f0c6eb9694548985153e1cfe6f91bef7f136e591b53a298'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='642a3d15399cbcb59bc591e7a0d02c0328829ef80958fc147d983bc7cf1f30ae'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='03cbfefd942b6c004c118c00ade4381538f27ac4a8ce2582fac0f12cd1a581a6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='9403e001bcc816e2506bcbf6d91f6213f2ec12631fe27e66e4e98583e8d44ea2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='51edac43e156fc653373cc675e7d41c4598c1976d494f5fea2d2b9b9b13cf23c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='72f70b4d70f1c47713c2a177a80bb2abc96c9321d16a1f8040f2f41098b51e5b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.hotspot.releases.full b/16/jdk/ubuntu/Dockerfile.hotspot.releases.full index 31e9543b7..cda4e1871 100644 --- a/16/jdk/ubuntu/Dockerfile.hotspot.releases.full +++ b/16/jdk/ubuntu/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.hotspot.releases.slim b/16/jdk/ubuntu/Dockerfile.hotspot.releases.slim index 114d58476..791aa073b 100644 --- a/16/jdk/ubuntu/Dockerfile.hotspot.releases.slim +++ b/16/jdk/ubuntu/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.openj9.nightly.full b/16/jdk/ubuntu/Dockerfile.openj9.nightly.full index 17384e863..5506043ca 100644 --- a/16/jdk/ubuntu/Dockerfile.openj9.nightly.full +++ b/16/jdk/ubuntu/Dockerfile.openj9.nightly.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.openj9.nightly.slim b/16/jdk/ubuntu/Dockerfile.openj9.nightly.slim index d56ce8112..276cce9df 100644 --- a/16/jdk/ubuntu/Dockerfile.openj9.nightly.slim +++ b/16/jdk/ubuntu/Dockerfile.openj9.nightly.slim @@ -27,28 +27,24 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5124b8f8ad93e298032fcc8e194507d9805ef76e87102c226d1da64233274e59'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='9f88c75ce39bba40774d098a734baddbb0758c993b5c848bce41bed2400495b6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='1ee88cb348ce7bab60fd711f906fe45ca8a5cf4674e153821d8ff33267d2930f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='85789ba54264342f70213955606c395e52f1a71a2ba1dbe16fcc5c44b9876d1d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='7ae0120cccc532fdd53d5c0092adb1841fc5df299ebac527e575a7da72511c87'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='1114be555ce0f315ffccff80ff6a059611ab459cfa2eebf9abefefdadd61f3aa'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jdk_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='f0a82e903f0919733fbf7ff53c0e65fd0787c3c41ed0f5d6d9c273998ac24667'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jdk_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.openj9.releases.full b/16/jdk/ubuntu/Dockerfile.openj9.releases.full index 8e096fb3b..731710b1a 100644 --- a/16/jdk/ubuntu/Dockerfile.openj9.releases.full +++ b/16/jdk/ubuntu/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/Dockerfile.openj9.releases.slim b/16/jdk/ubuntu/Dockerfile.openj9.releases.slim index 89c9330b0..b6fcca4dc 100644 --- a/16/jdk/ubuntu/Dockerfile.openj9.releases.slim +++ b/16/jdk/ubuntu/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='6659d96dff1fff2731cd3977a6aec69a1313700c32c56216e3f0ee9c6114cfde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jdk/ubuntu/slim-java.sh b/16/jdk/ubuntu/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/ubuntu/slim-java.sh +++ b/16/jdk/ubuntu/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index 612e88f6c..a285f4674 100644 --- a/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim b/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim index 786650941..a285f4674 100644 --- a/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index 94bd28e07..ff3ddd0c2 100644 --- a/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/16/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -23,12 +23,12 @@ FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.zip ; \ - Write-Host ('Verifying sha256 (e6cadfef528ad347bd23443d329501d18ac9f230485a426d40e1f7cfcb6a7ab0) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e6cadfef528ad347bd23443d329501d18ac9f230485a426d40e1f7cfcb6a7ab0') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (0a91e179c4d34b5d905fd2945a21927a6acb798b4e8f2d528ece32c025bbcaff) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '0a91e179c4d34b5d905fd2945a21927a6acb798b4e8f2d528ece32c025bbcaff') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/ Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,14 +44,10 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-16" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-16", "/openjdk-16"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index 89e7be54a..46d646a77 100644 --- a/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,35 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim b/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim index d54871966..46d646a77 100644 --- a/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim +++ b/16/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim @@ -17,38 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1809/slim-java.sh b/16/jdk/windows/nanoserver-1809/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/windows/nanoserver-1809/slim-java.sh +++ b/16/jdk/windows/nanoserver-1809/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index f68479632..2b3e4c407 100644 --- a/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim b/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim index e1ee0fbe6..2b3e4c407 100644 --- a/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim +++ b/16/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '6ebbe684c567d19c1c57ceba560ff33fb08a122d05fe899fcf7f1dd6e7d72c54') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index ec6748efb..13ded2d7a 100644 --- a/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,35 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim b/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim index fa31a9107..13ded2d7a 100644 --- a/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim +++ b/16/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim @@ -17,38 +17,38 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '1f5a4f0b81f0000992138069a2ee68f47c1d741f94111efee41c146f4d77253b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-1909/slim-java.sh b/16/jdk/windows/nanoserver-1909/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/windows/nanoserver-1909/slim-java.sh +++ b/16/jdk/windows/nanoserver-1909/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..eaea8aa30 --- /dev/null +++ b/16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..eaea8aa30 --- /dev/null +++ b/16/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..815e48212 --- /dev/null +++ b/16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim b/16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim new file mode 100644 index 000000000..815e48212 --- /dev/null +++ b/16/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim @@ -0,0 +1,54 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/16/jdk/windows/nanoserver-20h2/slim-java.sh b/16/jdk/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jdk/windows/nanoserver-20h2/slim-java.sh +++ b/16/jdk/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index ce8bc70b8..909c6e979 100644 --- a/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index a0836d5a7..93aa43cf1 100644 --- a/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/16/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi ; \ - Write-Host ('Verifying sha256 (7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (0a91e179c4d34b5d905fd2945a21927a6acb798b4e8f2d528ece32c025bbcaff) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '0a91e179c4d34b5d905fd2945a21927a6acb798b4e8f2d528ece32c025bbcaff') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index 48a8d6516..ea9a85fab 100644 --- a/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -22,24 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index 96b013ab2..205fca603 100644 --- a/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/16/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -22,29 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi ; \ - Write-Host ('Verifying sha256 (5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f0e25c1d5044e30a3879a83b4bbb8f8942be151d9523aef28d22647471354dd2) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f0e25c1d5044e30a3879a83b4bbb8f8942be151d9523aef28d22647471354dd2') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/16/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index 623a9fe77..7e971b443 100644 --- a/16/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/16/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1909 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/16/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 215422be4..1f94b883d 100644 --- a/16/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/16/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -22,24 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:1909 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/16/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..4fdcc106e --- /dev/null +++ b/16/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/16/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..fdbe634e8 --- /dev/null +++ b/16/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" +CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index 840a0df3a..b43f7d6f2 100644 --- a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index dd84f405d..64fe569fb 100644 --- a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (0a91e179c4d34b5d905fd2945a21927a6acb798b4e8f2d528ece32c025bbcaff) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '0a91e179c4d34b5d905fd2945a21927a6acb798b4e8f2d528ece32c025bbcaff') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index d9e2da816..ba9d4c214 100644 --- a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -22,24 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index bb1dfc13e..515c21055 100644 --- a/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/16/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -22,29 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f0e25c1d5044e30a3879a83b4bbb8f8942be151d9523aef28d22647471354dd2) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f0e25c1d5044e30a3879a83b4bbb8f8942be151d9523aef28d22647471354dd2') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index 1c2eb2547..a7f387e0c 100644 --- a/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fb3a076e0cfaa702d609eeaca17bd469c39951886355c01a775ed2fb38ad7d4b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e8fc45812503581f41f0f865dc8a869b077bd66d833a95464f2ea53fb94be03c') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser CMD ["jshell"] diff --git a/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 7730ff36d..f0c1da51b 100644 --- a/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/16/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -22,24 +22,32 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jdk_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8342d76be0b597bb6506e283f81d6a226c58b84665b1169d501d59e6d24b0784') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '67297270960369b41e04e848a15a16cd7dc6b172cdf102c4d28134ca134f6d3f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" CMD ["jshell"] diff --git a/16/jre/alpine/Dockerfile.hotspot.nightly.full b/16/jre/alpine/Dockerfile.hotspot.nightly.full index 064a2519c..3db11449b 100644 --- a/16/jre/alpine/Dockerfile.hotspot.nightly.full +++ b/16/jre/alpine/Dockerfile.hotspot.nightly.full @@ -21,64 +21,18 @@ FROM alpine:3.12 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ - && GLIBC_VER="2.31-r0" \ - && ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \ - && GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.1.0-2-x86_64.pkg.tar.zst" \ - && GCC_LIBS_SHA256="f80320a03ff73e82271064e4f684cd58d7dbdb07aa06a2c4eea8e0f3c507c45c" \ - && ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-3-x86_64.pkg.tar.xz" \ - && ZLIB_SHA256=17aede0b9f8baa789c5aa3f358fbf8c68a5f1228c5e6cba1a5dd34102ef4d4e5 \ - && curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \ - && SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \ - && echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \ - && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk \ - && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk \ - && curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \ - && apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk \ - && /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \ - && echo "export LANG=$LANG" > /etc/profile.d/locale.sh \ - && curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst \ - && echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - \ - && mkdir /tmp/gcc \ - && zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp \ - && tar -xf /tmp/gcc-libs.tar -C /tmp/gcc \ - && mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib \ - && strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so* \ - && curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz \ - && echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - \ - && mkdir /tmp/libz \ - && tar -xf /tmp/libz.tar.xz -C /tmp/libz \ - && mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \ - && apk del --purge .build-deps glibc-i18n \ - && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* +RUN apk add --no-cache tzdata musl-locales musl-locales-lang \ + && rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='6ae53ab070ea8a3f250e98e3b1d0e0ccf07e15a738c36ee0b1b3b27b2d8359bb'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_alpine-linux_hotspot_2021-04-26-23-35.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/alpine/Dockerfile.hotspot.releases.full b/16/jre/alpine/Dockerfile.hotspot.releases.full index 333f5bb44..0f8bf2c1e 100644 --- a/16/jre/alpine/Dockerfile.hotspot.releases.full +++ b/16/jre/alpine/Dockerfile.hotspot.releases.full @@ -24,15 +24,15 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN apk add --no-cache tzdata musl-locales musl-locales-lang \ && rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='8b3130d9eb5261898b7d5641280356bb3fb6774f966caf317cae324b4ff5f0e0'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_alpine-linux_hotspot_16_36.tar.gz'; \ + ESUM='5f10ffc12056b735f5fe505ec6c481fff94de27e80c1d77ea9f9e2830669cc1d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_alpine-linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/alpine/Dockerfile.openj9.nightly.full b/16/jre/alpine/Dockerfile.openj9.nightly.full index ef59d2de0..33d2cb6be 100644 --- a/16/jre/alpine/Dockerfile.openj9.nightly.full +++ b/16/jre/alpine/Dockerfile.openj9.nightly.full @@ -54,27 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/alpine/Dockerfile.openj9.releases.full b/16/jre/alpine/Dockerfile.openj9.releases.full index dbc803b74..b2b165327 100644 --- a/16/jre/alpine/Dockerfile.openj9.releases.full +++ b/16/jre/alpine/Dockerfile.openj9.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/centos/Dockerfile.hotspot.nightly.full b/16/jre/centos/Dockerfile.hotspot.nightly.full index 31dc70761..8b45eab88 100644 --- a/16/jre/centos/Dockerfile.hotspot.nightly.full +++ b/16/jre/centos/Dockerfile.hotspot.nightly.full @@ -24,30 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f2eb052457f3b787b1538bc562430b5f00626d3aa838314ccee7cfb148e32b52'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/centos/Dockerfile.hotspot.releases.full b/16/jre/centos/Dockerfile.hotspot.releases.full index 1cba45cb2..bf3acd520 100644 --- a/16/jre/centos/Dockerfile.hotspot.releases.full +++ b/16/jre/centos/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/centos/Dockerfile.openj9.nightly.full b/16/jre/centos/Dockerfile.openj9.nightly.full index d1cd6081c..7fba2b9f4 100644 --- a/16/jre/centos/Dockerfile.openj9.nightly.full +++ b/16/jre/centos/Dockerfile.openj9.nightly.full @@ -24,26 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/centos/Dockerfile.openj9.releases.full b/16/jre/centos/Dockerfile.openj9.releases.full index ee1c5413c..9efefd841 100644 --- a/16/jre/centos/Dockerfile.openj9.releases.full +++ b/16/jre/centos/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/clefos/Dockerfile.hotspot.nightly.full b/16/jre/clefos/Dockerfile.hotspot.nightly.full index 63d5e49e6..45fec57f3 100644 --- a/16/jre/clefos/Dockerfile.hotspot.nightly.full +++ b/16/jre/clefos/Dockerfile.hotspot.nightly.full @@ -24,30 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/clefos/Dockerfile.hotspot.releases.full b/16/jre/clefos/Dockerfile.hotspot.releases.full index 7d4f4f679..f24a20a95 100644 --- a/16/jre/clefos/Dockerfile.hotspot.releases.full +++ b/16/jre/clefos/Dockerfile.hotspot.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/clefos/Dockerfile.openj9.nightly.full b/16/jre/clefos/Dockerfile.openj9.nightly.full index cf0ee64ac..3b4df25d3 100644 --- a/16/jre/clefos/Dockerfile.openj9.nightly.full +++ b/16/jre/clefos/Dockerfile.openj9.nightly.full @@ -24,26 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/clefos/Dockerfile.openj9.releases.full b/16/jre/clefos/Dockerfile.openj9.releases.full index afa574781..2b867d665 100644 --- a/16/jre/clefos/Dockerfile.openj9.releases.full +++ b/16/jre/clefos/Dockerfile.openj9.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debian/Dockerfile.hotspot.nightly.full b/16/jre/debian/Dockerfile.hotspot.nightly.full index 1f4915f07..0845053e8 100644 --- a/16/jre/debian/Dockerfile.hotspot.nightly.full +++ b/16/jre/debian/Dockerfile.hotspot.nightly.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f2eb052457f3b787b1538bc562430b5f00626d3aa838314ccee7cfb148e32b52'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debian/Dockerfile.hotspot.releases.full b/16/jre/debian/Dockerfile.hotspot.releases.full index 0dcf857ab..c4fc0ebf5 100644 --- a/16/jre/debian/Dockerfile.hotspot.releases.full +++ b/16/jre/debian/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debian/Dockerfile.openj9.nightly.full b/16/jre/debian/Dockerfile.openj9.nightly.full index a18cb0b23..9b911ea31 100644 --- a/16/jre/debian/Dockerfile.openj9.nightly.full +++ b/16/jre/debian/Dockerfile.openj9.nightly.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debian/Dockerfile.openj9.releases.full b/16/jre/debian/Dockerfile.openj9.releases.full index fba110f3f..28e787813 100644 --- a/16/jre/debian/Dockerfile.openj9.releases.full +++ b/16/jre/debian/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debianslim/Dockerfile.hotspot.nightly.full b/16/jre/debianslim/Dockerfile.hotspot.nightly.full index 6c568bd6c..d7947aa9d 100644 --- a/16/jre/debianslim/Dockerfile.hotspot.nightly.full +++ b/16/jre/debianslim/Dockerfile.hotspot.nightly.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f2eb052457f3b787b1538bc562430b5f00626d3aa838314ccee7cfb148e32b52'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debianslim/Dockerfile.hotspot.releases.full b/16/jre/debianslim/Dockerfile.hotspot.releases.full index 59608b8f8..2a568d357 100644 --- a/16/jre/debianslim/Dockerfile.hotspot.releases.full +++ b/16/jre/debianslim/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debianslim/Dockerfile.openj9.nightly.full b/16/jre/debianslim/Dockerfile.openj9.nightly.full index 4685feea7..15d9a24eb 100644 --- a/16/jre/debianslim/Dockerfile.openj9.nightly.full +++ b/16/jre/debianslim/Dockerfile.openj9.nightly.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/debianslim/Dockerfile.openj9.releases.full b/16/jre/debianslim/Dockerfile.openj9.releases.full index ae3e42460..a32c1cdd8 100644 --- a/16/jre/debianslim/Dockerfile.openj9.releases.full +++ b/16/jre/debianslim/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/leap/Dockerfile.hotspot.nightly.full b/16/jre/leap/Dockerfile.hotspot.nightly.full index 9a58a9d5a..b048a4869 100644 --- a/16/jre/leap/Dockerfile.hotspot.nightly.full +++ b/16/jre/leap/Dockerfile.hotspot.nightly.full @@ -24,30 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f2eb052457f3b787b1538bc562430b5f00626d3aa838314ccee7cfb148e32b52'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/leap/Dockerfile.hotspot.releases.full b/16/jre/leap/Dockerfile.hotspot.releases.full index ffeccb990..b1049eaf4 100644 --- a/16/jre/leap/Dockerfile.hotspot.releases.full +++ b/16/jre/leap/Dockerfile.hotspot.releases.full @@ -24,26 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/leap/Dockerfile.openj9.nightly.full b/16/jre/leap/Dockerfile.openj9.nightly.full index d4f170add..d09b5814b 100644 --- a/16/jre/leap/Dockerfile.openj9.nightly.full +++ b/16/jre/leap/Dockerfile.openj9.nightly.full @@ -24,26 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ - s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/leap/Dockerfile.openj9.releases.full b/16/jre/leap/Dockerfile.openj9.releases.full index 2ea0bef68..b0e751852 100644 --- a/16/jre/leap/Dockerfile.openj9.releases.full +++ b/16/jre/leap/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/tumbleweed/Dockerfile.hotspot.nightly.full b/16/jre/tumbleweed/Dockerfile.hotspot.nightly.full index 10c3b37a4..6e2d82f16 100644 --- a/16/jre/tumbleweed/Dockerfile.hotspot.nightly.full +++ b/16/jre/tumbleweed/Dockerfile.hotspot.nightly.full @@ -24,30 +24,30 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f2eb052457f3b787b1538bc562430b5f00626d3aa838314ccee7cfb148e32b52'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/tumbleweed/Dockerfile.hotspot.releases.full b/16/jre/tumbleweed/Dockerfile.hotspot.releases.full index 94d07df2e..52ada5da1 100644 --- a/16/jre/tumbleweed/Dockerfile.hotspot.releases.full +++ b/16/jre/tumbleweed/Dockerfile.hotspot.releases.full @@ -24,30 +24,30 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/tumbleweed/Dockerfile.openj9.nightly.full b/16/jre/tumbleweed/Dockerfile.openj9.nightly.full index 533aad813..b612270f8 100644 --- a/16/jre/tumbleweed/Dockerfile.openj9.nightly.full +++ b/16/jre/tumbleweed/Dockerfile.openj9.nightly.full @@ -24,26 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/tumbleweed/Dockerfile.openj9.releases.full b/16/jre/tumbleweed/Dockerfile.openj9.releases.full index f927ecd24..e011353f4 100644 --- a/16/jre/tumbleweed/Dockerfile.openj9.releases.full +++ b/16/jre/tumbleweed/Dockerfile.openj9.releases.full @@ -24,22 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi-minimal/Dockerfile.hotspot.nightly.full b/16/jre/ubi-minimal/Dockerfile.hotspot.nightly.full index ce608acb7..f288a79c6 100644 --- a/16/jre/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/16/jre/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -26,36 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi-minimal/Dockerfile.hotspot.releases.full b/16/jre/ubi-minimal/Dockerfile.hotspot.releases.full index 4e864fe72..43195a98f 100644 --- a/16/jre/ubi-minimal/Dockerfile.hotspot.releases.full +++ b/16/jre/ubi-minimal/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36" \ + version="jdk-16.0.1+9" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi-minimal/Dockerfile.openj9.nightly.full b/16/jre/ubi-minimal/Dockerfile.openj9.nightly.full index 5c7f7c29f..74f7d1f30 100644 --- a/16/jre/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/16/jre/ubi-minimal/Dockerfile.openj9.nightly.full @@ -26,32 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi-minimal/Dockerfile.openj9.releases.full b/16/jre/ubi-minimal/Dockerfile.openj9.releases.full index 8e6a01808..f2541f9f2 100644 --- a/16/jre/ubi-minimal/Dockerfile.openj9.releases.full +++ b/16/jre/ubi-minimal/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36_openj9-0.25.0" \ + version="jdk-16.0.1+9_openj9-0.26.0" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi/Dockerfile.hotspot.nightly.full b/16/jre/ubi/Dockerfile.hotspot.nightly.full index af0c56f2a..0fd9242d7 100644 --- a/16/jre/ubi/Dockerfile.hotspot.nightly.full +++ b/16/jre/ubi/Dockerfile.hotspot.nightly.full @@ -26,36 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi/Dockerfile.hotspot.releases.full b/16/jre/ubi/Dockerfile.hotspot.releases.full index e9a35fb1a..cfcaa4aa2 100644 --- a/16/jre/ubi/Dockerfile.hotspot.releases.full +++ b/16/jre/ubi/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36" \ + version="jdk-16.0.1+9" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi/Dockerfile.openj9.nightly.full b/16/jre/ubi/Dockerfile.openj9.nightly.full index 79c4375bc..e5b8a1de9 100644 --- a/16/jre/ubi/Dockerfile.openj9.nightly.full +++ b/16/jre/ubi/Dockerfile.openj9.nightly.full @@ -26,32 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk16" \ + version="jdk16u" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubi/Dockerfile.openj9.releases.full b/16/jre/ubi/Dockerfile.openj9.releases.full index 29bc37e0b..2c780fcab 100644 --- a/16/jre/ubi/Dockerfile.openj9.releases.full +++ b/16/jre/ubi/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk-16+36_openj9-0.25.0" \ + version="jdk-16.0.1+9_openj9-0.26.0" \ release="16" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubuntu/Dockerfile.hotspot.nightly.full b/16/jre/ubuntu/Dockerfile.hotspot.nightly.full index 25b321103..fa1a2ee81 100644 --- a/16/jre/ubuntu/Dockerfile.hotspot.nightly.full +++ b/16/jre/ubuntu/Dockerfile.hotspot.nightly.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='59bf53f743387fb81471566143ac71faacd3fc8f95acc95bca47a902afa89f8d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='688ffdf2044a325c50484bc81803ec4085395121831773af730cafacbb7a99f7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_aarch64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='a8125223bd1135f4c2787c922d062678f6afba2490331052bfc877409c54e756'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_arm_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f2eb052457f3b787b1538bc562430b5f00626d3aa838314ccee7cfb148e32b52'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_arm_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='9c35eed8af3570e0e6c2f1f025c8c8cf7a8d4163e405a02c9c115df4431c2511'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='f7a04f4ffb9dbf5ebf115b9dc60b1c913d5cad876b5ca1c20b5112bf4e35277d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='781a5796937e9978a9b5e6fd4aeff3ac78a9675d4ff98912ea0ed7588ec24b7e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='15ceba52c61a842fe166f2c783fa4e71108e01c7779ef3667d633e4498b61916'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='2629e1131ce5d2fcc08641804e0d6ee4a853ac875fc64ab4190ef34193347b2c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_hotspot_2021-03-16-01-39.tar.gz'; \ + ESUM='393c9eb2b8917fc97f7e183b6356a19f0a4f3e3011a4109b87805defcaba9cef'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_hotspot_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubuntu/Dockerfile.hotspot.releases.full b/16/jre/ubuntu/Dockerfile.hotspot.releases.full index 61b0607a7..cf3013b8d 100644 --- a/16/jre/ubuntu/Dockerfile.hotspot.releases.full +++ b/16/jre/ubuntu/Dockerfile.hotspot.releases.full @@ -27,30 +27,30 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \ + ESUM='4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \ + ESUM='c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \ + ESUM='495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ s390x) \ - ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \ + ESUM='780f10923df3230b6013c74482adcc6d8c1fef7b60aefe59a0b337183767d214'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_s390x_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \ + ESUM='5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubuntu/Dockerfile.openj9.nightly.full b/16/jre/ubuntu/Dockerfile.openj9.nightly.full index bd25d6392..a5204368c 100644 --- a/16/jre/ubuntu/Dockerfile.openj9.nightly.full +++ b/16/jre/ubuntu/Dockerfile.openj9.nightly.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='5f2c4c69c9148bbcf2ac5ce9e5ace95e46d7fbd58d2b34bc1e22d69ce195e47d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_aarch64_linux_openj9_2021-03-16-01-39.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='c04ef15b2bd29030ee49653eb66261557fcd33172b9b1f4396561aef2bc01767'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_ppc64le_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='90059dcebb4dfc49bf7fef32fe7bd5d27365f65e8d05a668e9c645984fa8a9cf'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_ppc64le_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ s390x) \ - ESUM='86e72915c8d54919d7e786af1474c8c69caa80c4eb283004c23b4956daa61a7f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_s390x_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='c0d601202dcafa2bd91360bf5fc9a517880448bd1631de39bff3337f557fcba5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_s390x_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='97e22da5ce79b8523d77e0a786a415b68d4f889a70a98d72f2e7ab1262dc3210'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-16-01-39/OpenJDK16-jre_x64_linux_openj9_2021-03-16-01-39.tar.gz'; \ + ESUM='bfcd422b1cdd73637f49fa5075e5548046c13fabaf7399a7946185423749f200'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-27-05-00/OpenJDK16U-jre_x64_linux_openj9_2021-04-27-05-00.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/ubuntu/Dockerfile.openj9.releases.full b/16/jre/ubuntu/Dockerfile.openj9.releases.full index 539c69e3c..d1cffc1ec 100644 --- a/16/jre/ubuntu/Dockerfile.openj9.releases.full +++ b/16/jre/ubuntu/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='9fd79eacf7371b34bfeb1c8ccd8563421336a6ab767fe0726b86e7bfb8eebfe2'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_s390x_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \ + ESUM='fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index c07660282..ce02989a3 100644 --- a/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim b/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim index b56b71796..ce02989a3 100644 --- a/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim +++ b/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim @@ -17,36 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index 280990858..03df4498b 100644 --- a/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/16/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -23,12 +23,12 @@ FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.zip ; \ - Write-Host ('Verifying sha256 (0769aa0d23de037372b79cb6c208afabc098fede4e41d0a1b45aca81f789f1c5) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '0769aa0d23de037372b79cb6c208afabc098fede4e41d0a1b45aca81f789f1c5') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/ Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,13 +44,9 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-16" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-16", "/openjdk-16"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" diff --git a/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index b31112da4..129baec04 100644 --- a/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim b/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim index ada026849..129baec04 100644 --- a/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim +++ b/16/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/nanoserver-1809/slim-java.sh b/16/jre/windows/nanoserver-1809/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jre/windows/nanoserver-1809/slim-java.sh +++ b/16/jre/windows/nanoserver-1809/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index 37396131f..5516327ea 100644 --- a/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim b/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim index 33eb5e14b..5516327ea 100644 --- a/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim +++ b/16/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim @@ -17,36 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'b003256714a22ac3c46fe6cf0af14619d93384efa15f5976617d4bba05929e38') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index 8e4b31570..acfa13dc8 100644 --- a/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim b/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim index f8d98df3e..acfa13dc8 100644 --- a/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim +++ b/16/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_VERSION jdk16 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -COPY slim-java* C:/ProgramData/Java/ +ENV JAVA_VERSION jdk16u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '42d4c55518e7f537ddb5a1d5056acf6745a5ed3b49512b76cf4f927428ae8d8e') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-16; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-16; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-16 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/nanoserver-1909/slim-java.sh b/16/jre/windows/nanoserver-1909/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jre/windows/nanoserver-1909/slim-java.sh +++ b/16/jre/windows/nanoserver-1909/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..ff0c8dc57 --- /dev/null +++ b/16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..ff0c8dc57 --- /dev/null +++ b/16/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..8fb46d30e --- /dev/null +++ b/16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim b/16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim new file mode 100644 index 000000000..8fb46d30e --- /dev/null +++ b/16/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/nanoserver-20h2/slim-java.sh b/16/jre/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/16/jre/windows/nanoserver-20h2/slim-java.sh +++ b/16/jre/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index f9c9b83b7..7b52a3827 100644 --- a/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -22,22 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index 5dd6d9d9f..3b68b46eb 100644 --- a/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/16/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi ; \ - Write-Host ('Verifying sha256 (8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index 035b3ad6c..4c3b63819 100644 --- a/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (d3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index dee2cff3a..e0e258940 100644 --- a/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/16/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi ; \ - Write-Host ('Verifying sha256 (49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (77318a7ebd0fa9cdaa69822a4bd426e28818a5296a1cb510a60b3dff04261f70) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '77318a7ebd0fa9cdaa69822a4bd426e28818a5296a1cb510a60b3dff04261f70') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/16/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index 2cd9ee866..3a7a28df9 100644 --- a/16/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/16/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -22,22 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:1909 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/16/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 33a474cf8..2dcaca7c3 100644 --- a/16/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/16/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1909 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (d3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/16/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..962c7bb60 --- /dev/null +++ b/16/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,51 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/16/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..eb872496f --- /dev/null +++ b/16/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk16u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index 635f92cf1..6973a34f0 100644 --- a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -22,22 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index dc3585a21..38133d106 100644 --- a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36 +ENV JAVA_VERSION jdk-16.0.1+9 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index 6c44387fa..2c3e5eb2a 100644 --- a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (d3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index c37ebbbab..3ddc13088 100644 --- a/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/16/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-16+36_openj9-0.25.0 +ENV JAVA_VERSION jdk-16.0.1+9_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (77318a7ebd0fa9cdaa69822a4bd426e28818a5296a1cb510a60b3dff04261f70) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '77318a7ebd0fa9cdaa69822a4bd426e28818a5296a1cb510a60b3dff04261f70') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index 8a39ac8ed..f209ce57e 100644 --- a/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -22,22 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_hotspot_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5e6ea5c30f827b10ff05ab437cd51a1e194d0ffc3fd8ee6c7c8a5b6d73256538') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '004c500cf7993b2e6bf5b030137273cba6d486e29f4b8c43158d343d61e978da') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 7e863c00c..284f06d5d 100644 --- a/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/16/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -22,23 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk16 +ENV JAVA_VERSION jdk16u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16-2021-03-13-03-17/OpenJDK16-jre_x64_windows_openj9_2021-03-13-03-17.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (d3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'd3fa6980c77130d59a7723585938897c7602a3d25def3c3895ee48a41ff173c4') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '06ad0141747fd9b346b8d4ae7b19e0e8969271ed324f26e0508512bc5fdce573') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/alpine/Dockerfile.hotspot.nightly.full b/8/jdk/alpine/Dockerfile.hotspot.nightly.full index 868c187fd..c44f8d20a 100644 --- a/8/jdk/alpine/Dockerfile.hotspot.nightly.full +++ b/8/jdk/alpine/Dockerfile.hotspot.nightly.full @@ -60,25 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.hotspot.nightly.slim b/8/jdk/alpine/Dockerfile.hotspot.nightly.slim index 861841943..507589471 100644 --- a/8/jdk/alpine/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/alpine/Dockerfile.hotspot.nightly.slim @@ -62,25 +62,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.hotspot.releases.full b/8/jdk/alpine/Dockerfile.hotspot.releases.full index a6361dbe4..cdd4cc0d9 100644 --- a/8/jdk/alpine/Dockerfile.hotspot.releases.full +++ b/8/jdk/alpine/Dockerfile.hotspot.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.hotspot.releases.slim b/8/jdk/alpine/Dockerfile.hotspot.releases.slim index 7ccc8d678..64b470bf9 100644 --- a/8/jdk/alpine/Dockerfile.hotspot.releases.slim +++ b/8/jdk/alpine/Dockerfile.hotspot.releases.slim @@ -54,7 +54,7 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -63,8 +63,8 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.openj9.nightly.full b/8/jdk/alpine/Dockerfile.openj9.nightly.full index af3d1061c..30b420585 100644 --- a/8/jdk/alpine/Dockerfile.openj9.nightly.full +++ b/8/jdk/alpine/Dockerfile.openj9.nightly.full @@ -60,21 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.openj9.nightly.slim b/8/jdk/alpine/Dockerfile.openj9.nightly.slim index ac686554a..19444248b 100644 --- a/8/jdk/alpine/Dockerfile.openj9.nightly.slim +++ b/8/jdk/alpine/Dockerfile.openj9.nightly.slim @@ -62,21 +62,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.openj9.releases.full b/8/jdk/alpine/Dockerfile.openj9.releases.full index a0d4415a9..87272d4bc 100644 --- a/8/jdk/alpine/Dockerfile.openj9.releases.full +++ b/8/jdk/alpine/Dockerfile.openj9.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/Dockerfile.openj9.releases.slim b/8/jdk/alpine/Dockerfile.openj9.releases.slim index 7d542ae76..db67d24b8 100644 --- a/8/jdk/alpine/Dockerfile.openj9.releases.slim +++ b/8/jdk/alpine/Dockerfile.openj9.releases.slim @@ -54,7 +54,7 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -63,8 +63,8 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/alpine/slim-java.sh b/8/jdk/alpine/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/alpine/slim-java.sh +++ b/8/jdk/alpine/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/centos/Dockerfile.hotspot.nightly.full b/8/jdk/centos/Dockerfile.hotspot.nightly.full index 9e557e2ca..2317f2a4b 100644 --- a/8/jdk/centos/Dockerfile.hotspot.nightly.full +++ b/8/jdk/centos/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.hotspot.nightly.slim b/8/jdk/centos/Dockerfile.hotspot.nightly.slim index 64ee51d18..952401eb1 100644 --- a/8/jdk/centos/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/centos/Dockerfile.hotspot.nightly.slim @@ -32,24 +32,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.hotspot.releases.full b/8/jdk/centos/Dockerfile.hotspot.releases.full index 498b10107..8c07ad62f 100644 --- a/8/jdk/centos/Dockerfile.hotspot.releases.full +++ b/8/jdk/centos/Dockerfile.hotspot.releases.full @@ -24,26 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL=''; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.hotspot.releases.slim b/8/jdk/centos/Dockerfile.hotspot.releases.slim index d32eadf0d..5a8253691 100644 --- a/8/jdk/centos/Dockerfile.hotspot.releases.slim +++ b/8/jdk/centos/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -32,20 +32,16 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.openj9.nightly.full b/8/jdk/centos/Dockerfile.openj9.nightly.full index 1bef51cca..cc7df9d06 100644 --- a/8/jdk/centos/Dockerfile.openj9.nightly.full +++ b/8/jdk/centos/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.openj9.nightly.slim b/8/jdk/centos/Dockerfile.openj9.nightly.slim index 921b53e82..ea9693d62 100644 --- a/8/jdk/centos/Dockerfile.openj9.nightly.slim +++ b/8/jdk/centos/Dockerfile.openj9.nightly.slim @@ -31,21 +31,13 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.openj9.releases.full b/8/jdk/centos/Dockerfile.openj9.releases.full index 2dbdffff3..c172e9d79 100644 --- a/8/jdk/centos/Dockerfile.openj9.releases.full +++ b/8/jdk/centos/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/Dockerfile.openj9.releases.slim b/8/jdk/centos/Dockerfile.openj9.releases.slim index d0dd3f794..761884969 100644 --- a/8/jdk/centos/Dockerfile.openj9.releases.slim +++ b/8/jdk/centos/Dockerfile.openj9.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -32,12 +32,12 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/centos/slim-java.sh b/8/jdk/centos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/centos/slim-java.sh +++ b/8/jdk/centos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/clefos/Dockerfile.hotspot.nightly.full b/8/jdk/clefos/Dockerfile.hotspot.nightly.full index c332529bb..50ef03825 100644 --- a/8/jdk/clefos/Dockerfile.hotspot.nightly.full +++ b/8/jdk/clefos/Dockerfile.hotspot.nightly.full @@ -29,25 +29,9 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.hotspot.nightly.slim b/8/jdk/clefos/Dockerfile.hotspot.nightly.slim index 6dd69c1d9..a4e7f91e4 100644 --- a/8/jdk/clefos/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/clefos/Dockerfile.hotspot.nightly.slim @@ -31,25 +31,9 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.hotspot.releases.full b/8/jdk/clefos/Dockerfile.hotspot.releases.full index e1d38fa8a..a992b9bb9 100644 --- a/8/jdk/clefos/Dockerfile.hotspot.releases.full +++ b/8/jdk/clefos/Dockerfile.hotspot.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.hotspot.releases.slim b/8/jdk/clefos/Dockerfile.hotspot.releases.slim index b8191f968..c65bdb755 100644 --- a/8/jdk/clefos/Dockerfile.hotspot.releases.slim +++ b/8/jdk/clefos/Dockerfile.hotspot.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -32,8 +32,8 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.openj9.nightly.full b/8/jdk/clefos/Dockerfile.openj9.nightly.full index 5a475fa78..16a269133 100644 --- a/8/jdk/clefos/Dockerfile.openj9.nightly.full +++ b/8/jdk/clefos/Dockerfile.openj9.nightly.full @@ -29,21 +29,9 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.openj9.nightly.slim b/8/jdk/clefos/Dockerfile.openj9.nightly.slim index ea9677258..44d074f68 100644 --- a/8/jdk/clefos/Dockerfile.openj9.nightly.slim +++ b/8/jdk/clefos/Dockerfile.openj9.nightly.slim @@ -31,21 +31,9 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.openj9.releases.full b/8/jdk/clefos/Dockerfile.openj9.releases.full index c1ed6bf59..775883b09 100644 --- a/8/jdk/clefos/Dockerfile.openj9.releases.full +++ b/8/jdk/clefos/Dockerfile.openj9.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/Dockerfile.openj9.releases.slim b/8/jdk/clefos/Dockerfile.openj9.releases.slim index 721221a85..ae403e5fd 100644 --- a/8/jdk/clefos/Dockerfile.openj9.releases.slim +++ b/8/jdk/clefos/Dockerfile.openj9.releases.slim @@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -32,8 +32,8 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/clefos/slim-java.sh b/8/jdk/clefos/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/clefos/slim-java.sh +++ b/8/jdk/clefos/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/debian/Dockerfile.hotspot.nightly.full b/8/jdk/debian/Dockerfile.hotspot.nightly.full index 4dd6b9f5a..051e0d606 100644 --- a/8/jdk/debian/Dockerfile.hotspot.nightly.full +++ b/8/jdk/debian/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.hotspot.nightly.slim b/8/jdk/debian/Dockerfile.hotspot.nightly.slim index e63baa084..153605771 100644 --- a/8/jdk/debian/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/debian/Dockerfile.hotspot.nightly.slim @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.hotspot.releases.full b/8/jdk/debian/Dockerfile.hotspot.releases.full index 139cf45e0..e65344898 100644 --- a/8/jdk/debian/Dockerfile.hotspot.releases.full +++ b/8/jdk/debian/Dockerfile.hotspot.releases.full @@ -27,30 +27,26 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.hotspot.releases.slim b/8/jdk/debian/Dockerfile.hotspot.releases.slim index 01e7a8f23..e97fe87a7 100644 --- a/8/jdk/debian/Dockerfile.hotspot.releases.slim +++ b/8/jdk/debian/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,20 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.openj9.nightly.full b/8/jdk/debian/Dockerfile.openj9.nightly.full index 72fb828c3..6bafcc322 100644 --- a/8/jdk/debian/Dockerfile.openj9.nightly.full +++ b/8/jdk/debian/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.openj9.nightly.slim b/8/jdk/debian/Dockerfile.openj9.nightly.slim index a5c4dde87..3e42235da 100644 --- a/8/jdk/debian/Dockerfile.openj9.nightly.slim +++ b/8/jdk/debian/Dockerfile.openj9.nightly.slim @@ -34,21 +34,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.openj9.releases.full b/8/jdk/debian/Dockerfile.openj9.releases.full index 7954cb57c..85f098ad8 100644 --- a/8/jdk/debian/Dockerfile.openj9.releases.full +++ b/8/jdk/debian/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/Dockerfile.openj9.releases.slim b/8/jdk/debian/Dockerfile.openj9.releases.slim index 1c87d68f1..2c6b24c4e 100644 --- a/8/jdk/debian/Dockerfile.openj9.releases.slim +++ b/8/jdk/debian/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debian/slim-java.sh b/8/jdk/debian/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/debian/slim-java.sh +++ b/8/jdk/debian/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/debianslim/Dockerfile.hotspot.nightly.full b/8/jdk/debianslim/Dockerfile.hotspot.nightly.full index 7595435de..c772e94e9 100644 --- a/8/jdk/debianslim/Dockerfile.hotspot.nightly.full +++ b/8/jdk/debianslim/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.hotspot.nightly.slim b/8/jdk/debianslim/Dockerfile.hotspot.nightly.slim index dd3f50a71..7bc6f49c6 100644 --- a/8/jdk/debianslim/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/debianslim/Dockerfile.hotspot.nightly.slim @@ -35,24 +35,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.hotspot.releases.full b/8/jdk/debianslim/Dockerfile.hotspot.releases.full index 4fea18299..0084ce500 100644 --- a/8/jdk/debianslim/Dockerfile.hotspot.releases.full +++ b/8/jdk/debianslim/Dockerfile.hotspot.releases.full @@ -27,30 +27,26 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.hotspot.releases.slim b/8/jdk/debianslim/Dockerfile.hotspot.releases.slim index 188a535b2..fce7e113a 100644 --- a/8/jdk/debianslim/Dockerfile.hotspot.releases.slim +++ b/8/jdk/debianslim/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -35,24 +35,20 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.openj9.nightly.full b/8/jdk/debianslim/Dockerfile.openj9.nightly.full index d61beee29..6d606ff4b 100644 --- a/8/jdk/debianslim/Dockerfile.openj9.nightly.full +++ b/8/jdk/debianslim/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.openj9.nightly.slim b/8/jdk/debianslim/Dockerfile.openj9.nightly.slim index 114af16e7..d70da0dfb 100644 --- a/8/jdk/debianslim/Dockerfile.openj9.nightly.slim +++ b/8/jdk/debianslim/Dockerfile.openj9.nightly.slim @@ -34,21 +34,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.openj9.releases.full b/8/jdk/debianslim/Dockerfile.openj9.releases.full index e879ba666..2a2ee065c 100644 --- a/8/jdk/debianslim/Dockerfile.openj9.releases.full +++ b/8/jdk/debianslim/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/Dockerfile.openj9.releases.slim b/8/jdk/debianslim/Dockerfile.openj9.releases.slim index 528ac2d99..c5d6bcc33 100644 --- a/8/jdk/debianslim/Dockerfile.openj9.releases.slim +++ b/8/jdk/debianslim/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/debianslim/slim-java.sh b/8/jdk/debianslim/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/debianslim/slim-java.sh +++ b/8/jdk/debianslim/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/leap/Dockerfile.hotspot.nightly.full b/8/jdk/leap/Dockerfile.hotspot.nightly.full index 77097c4f7..f9ad53a48 100644 --- a/8/jdk/leap/Dockerfile.hotspot.nightly.full +++ b/8/jdk/leap/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/leap/Dockerfile.hotspot.releases.full b/8/jdk/leap/Dockerfile.hotspot.releases.full index 4c004c261..31418b16c 100644 --- a/8/jdk/leap/Dockerfile.hotspot.releases.full +++ b/8/jdk/leap/Dockerfile.hotspot.releases.full @@ -24,26 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/leap/Dockerfile.openj9.nightly.full b/8/jdk/leap/Dockerfile.openj9.nightly.full index 1a353b2a2..ee14f05e5 100644 --- a/8/jdk/leap/Dockerfile.openj9.nightly.full +++ b/8/jdk/leap/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/leap/Dockerfile.openj9.releases.full b/8/jdk/leap/Dockerfile.openj9.releases.full index 5640e95dc..9062687ad 100644 --- a/8/jdk/leap/Dockerfile.openj9.releases.full +++ b/8/jdk/leap/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/tumbleweed/Dockerfile.hotspot.nightly.full b/8/jdk/tumbleweed/Dockerfile.hotspot.nightly.full index 5a870608f..189a07e06 100644 --- a/8/jdk/tumbleweed/Dockerfile.hotspot.nightly.full +++ b/8/jdk/tumbleweed/Dockerfile.hotspot.nightly.full @@ -30,24 +30,24 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/tumbleweed/Dockerfile.hotspot.releases.full b/8/jdk/tumbleweed/Dockerfile.hotspot.releases.full index 869bd42cc..552a1a776 100644 --- a/8/jdk/tumbleweed/Dockerfile.hotspot.releases.full +++ b/8/jdk/tumbleweed/Dockerfile.hotspot.releases.full @@ -24,30 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/tumbleweed/Dockerfile.openj9.nightly.full b/8/jdk/tumbleweed/Dockerfile.openj9.nightly.full index 78820bffc..8200250bc 100644 --- a/8/jdk/tumbleweed/Dockerfile.openj9.nightly.full +++ b/8/jdk/tumbleweed/Dockerfile.openj9.nightly.full @@ -29,21 +29,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/tumbleweed/Dockerfile.openj9.releases.full b/8/jdk/tumbleweed/Dockerfile.openj9.releases.full index 6876fea59..aa69d25ca 100644 --- a/8/jdk/tumbleweed/Dockerfile.openj9.releases.full +++ b/8/jdk/tumbleweed/Dockerfile.openj9.releases.full @@ -24,22 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full b/8/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full index 36d378851..c8bc3c613 100644 --- a/8/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/8/jdk/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi-minimal/Dockerfile.hotspot.releases.full b/8/jdk/ubi-minimal/Dockerfile.hotspot.releases.full index 57d02a026..8c387a684 100644 --- a/8/jdk/ubi-minimal/Dockerfile.hotspot.releases.full +++ b/8/jdk/ubi-minimal/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08" \ + version="jdk8u292-b10" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi-minimal/Dockerfile.openj9.nightly.full b/8/jdk/ubi-minimal/Dockerfile.openj9.nightly.full index 0714019dd..dd1bcea09 100644 --- a/8/jdk/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/8/jdk/ubi-minimal/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi-minimal/Dockerfile.openj9.releases.full b/8/jdk/ubi-minimal/Dockerfile.openj9.releases.full index b0f45a93a..394147067 100644 --- a/8/jdk/ubi-minimal/Dockerfile.openj9.releases.full +++ b/8/jdk/ubi-minimal/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08_openj9-0.24.0" \ + version="jdk8u292-b10_openj9-0.26.0" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.hotspot.nightly.full b/8/jdk/ubi/Dockerfile.hotspot.nightly.full index 8dc4e4ace..f96bac55d 100644 --- a/8/jdk/ubi/Dockerfile.hotspot.nightly.full +++ b/8/jdk/ubi/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.hotspot.nightly.slim b/8/jdk/ubi/Dockerfile.hotspot.nightly.slim index dea247a9f..76897c356 100644 --- a/8/jdk/ubi/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/ubi/Dockerfile.hotspot.nightly.slim @@ -40,24 +40,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.hotspot.releases.full b/8/jdk/ubi/Dockerfile.hotspot.releases.full index 45741df11..62a7c3dfb 100644 --- a/8/jdk/ubi/Dockerfile.hotspot.releases.full +++ b/8/jdk/ubi/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08" \ + version="jdk8u292-b10" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.hotspot.releases.slim b/8/jdk/ubi/Dockerfile.hotspot.releases.slim index 11b62e75c..cb7e7d9e2 100644 --- a/8/jdk/ubi/Dockerfile.hotspot.releases.slim +++ b/8/jdk/ubi/Dockerfile.hotspot.releases.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08" \ + version="jdk8u292-b10" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -40,20 +40,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.openj9.nightly.full b/8/jdk/ubi/Dockerfile.openj9.nightly.full index 3ca278e42..5d5e6422d 100644 --- a/8/jdk/ubi/Dockerfile.openj9.nightly.full +++ b/8/jdk/ubi/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.openj9.nightly.slim b/8/jdk/ubi/Dockerfile.openj9.nightly.slim index 329120e7b..dc24d03c7 100644 --- a/8/jdk/ubi/Dockerfile.openj9.nightly.slim +++ b/8/jdk/ubi/Dockerfile.openj9.nightly.slim @@ -39,21 +39,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.openj9.releases.full b/8/jdk/ubi/Dockerfile.openj9.releases.full index c18518a1c..2bc71c688 100644 --- a/8/jdk/ubi/Dockerfile.openj9.releases.full +++ b/8/jdk/ubi/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08_openj9-0.24.0" \ + version="jdk8u292-b10_openj9-0.26.0" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/Dockerfile.openj9.releases.slim b/8/jdk/ubi/Dockerfile.openj9.releases.slim index 5768443f4..9cc2ed9d2 100644 --- a/8/jdk/ubi/Dockerfile.openj9.releases.slim +++ b/8/jdk/ubi/Dockerfile.openj9.releases.slim @@ -26,13 +26,13 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08_openj9-0.24.0" \ + version="jdk8u292-b10_openj9-0.26.0" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -40,16 +40,16 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubi/slim-java.sh b/8/jdk/ubi/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/ubi/slim-java.sh +++ b/8/jdk/ubi/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.nightly.full b/8/jdk/ubuntu/Dockerfile.hotspot.nightly.full index d3d0c128e..48a80d909 100644 --- a/8/jdk/ubuntu/Dockerfile.hotspot.nightly.full +++ b/8/jdk/ubuntu/Dockerfile.hotspot.nightly.full @@ -33,20 +33,20 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ LIBFFI_SUM='05e456a2e8ad9f20db846ccb96c483235c3243e27025c3e8e8e358411fd48be9'; \ LIBFFI_URL='http://launchpadlibrarian.net/354371408/libffi6_3.2.1-8_s390x.deb'; \ curl -LfsSo /tmp/libffi6.deb ${LIBFFI_URL}; \ @@ -55,8 +55,8 @@ RUN set -eux; \ rm -rf /tmp/libffi6.deb; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim b/8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim index ce3f203a3..87cd49cd4 100644 --- a/8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/ubuntu/Dockerfile.hotspot.nightly.slim @@ -35,20 +35,20 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8f491e4cb0fca99bdfc1a6cbf778c461f4417c1b960d17cca6b026d19c168974'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0bcf3ed36822793891359438cf41e0344d8bd3049147038ca250f3419bc3db39'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='e9d2898d218778572e75cae9c1e42e409c8a625a53503a046f1e384417809d57'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='99c1635d7b7e260a9832c54ea86981bd8912cf55ea5682e01f6a73e350f75245'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='82649b31563f34095cda52914c7c64085b15127796d1d57b034a3de8126160bd'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='f1d38d3672d1d35b1a5efe7403f7c3eb53084096cdcf945ce1963f45f498ab3a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='ff150c9e933ffdba5e69982dd84d8e6ec6b3c118ce8bb568f40b22cff8959615'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='fdb43cb64d28a9b3778b1098668c31c94a89e547ce28e249fe7b518b5f107fde'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ LIBFFI_SUM='05e456a2e8ad9f20db846ccb96c483235c3243e27025c3e8e8e358411fd48be9'; \ LIBFFI_URL='http://launchpadlibrarian.net/354371408/libffi6_3.2.1-8_s390x.deb'; \ curl -LfsSo /tmp/libffi6.deb ${LIBFFI_URL}; \ @@ -57,8 +57,8 @@ RUN set -eux; \ rm -rf /tmp/libffi6.deb; \ ;; \ amd64|x86_64) \ - ESUM='fc146b519518726dc98cb05bca375d93da7d7a7083067c94816c8478a5886291'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0786fc486c5b5939312bd31e603c9915da22c0a123e944cdb7ba48ee941f5c6b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.releases.full b/8/jdk/ubuntu/Dockerfile.hotspot.releases.full index 3c30de273..1f098fd8e 100644 --- a/8/jdk/ubuntu/Dockerfile.hotspot.releases.full +++ b/8/jdk/ubuntu/Dockerfile.hotspot.releases.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ LIBFFI_SUM='05e456a2e8ad9f20db846ccb96c483235c3243e27025c3e8e8e358411fd48be9'; \ LIBFFI_URL='http://launchpadlibrarian.net/354371408/libffi6_3.2.1-8_s390x.deb'; \ curl -LfsSo /tmp/libffi6.deb ${LIBFFI_URL}; \ @@ -55,8 +51,8 @@ RUN set -eux; \ rm -rf /tmp/libffi6.deb; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.hotspot.releases.slim b/8/jdk/ubuntu/Dockerfile.hotspot.releases.slim index 3d0519ec6..5ffe21944 100644 --- a/8/jdk/ubuntu/Dockerfile.hotspot.releases.slim +++ b/8/jdk/ubuntu/Dockerfile.hotspot.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 COPY slim-java* /usr/local/bin/ @@ -35,20 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='d84896c039e39ad73e4c6a9f8e3d8049189e8fdd5cbc16c415c5808cd4c9f54d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d69bd545691058b55337d2a5eb1092880a5cab0753ede4d82b181242aac8a8fe'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='7ecf00e57033296fd23201477a64dc13a1356b16a635907e104d079ddb544e4b'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='040cde56788a803a6972af9e5d4985dbb8d698e6691c3aa0edfc765e91aeea33'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='276a431c79b7e94bc1b1b4fd88523383ae2d635ea67114dfc8a6174267f8fb2c'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_s390x_linux_hotspot_8u292b10.tar.gz'; \ LIBFFI_SUM='05e456a2e8ad9f20db846ccb96c483235c3243e27025c3e8e8e358411fd48be9'; \ LIBFFI_URL='http://launchpadlibrarian.net/354371408/libffi6_3.2.1-8_s390x.deb'; \ curl -LfsSo /tmp/libffi6.deb ${LIBFFI_URL}; \ @@ -57,8 +53,8 @@ RUN set -eux; \ rm -rf /tmp/libffi6.deb; \ ;; \ amd64|x86_64) \ - ESUM='e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.openj9.nightly.full b/8/jdk/ubuntu/Dockerfile.openj9.nightly.full index c2a808494..ac0ff649d 100644 --- a/8/jdk/ubuntu/Dockerfile.openj9.nightly.full +++ b/8/jdk/ubuntu/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.openj9.nightly.slim b/8/jdk/ubuntu/Dockerfile.openj9.nightly.slim index cb539a2c2..6a49316e4 100644 --- a/8/jdk/ubuntu/Dockerfile.openj9.nightly.slim +++ b/8/jdk/ubuntu/Dockerfile.openj9.nightly.slim @@ -34,21 +34,17 @@ COPY slim-java* /usr/local/bin/ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='ad82df17fea631f41121dbe19c8c0a6bbcca881c25dcb552e287e313c1768f84'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='891daca1dac3101e9a552f1c393efbbc527992b99a97087db985edb36fb15e9f'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83ff086a138a1923d390a7aa1726cddbdba1c6b584cf242e21cd34a8867c2471'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='c1e6282d0c0d37c4cdb6f277183f6618a1a58c8e4a8f471aad93b13546f1d27a'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='97cddd9fa541ee19749e5a48dafae9a81816b5d76e32da87d8ef4bcc029ef112'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='6197782cfda477db4f7142b32e6126c2be8431826bf0dc304caeda7e4dd0e892'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='ca1b36ea8219c23a871a5f35263673ef4fecff4133b41b4922b927ea3c6427ed'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jdk_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.openj9.releases.full b/8/jdk/ubuntu/Dockerfile.openj9.releases.full index 0f433f634..0f984996e 100644 --- a/8/jdk/ubuntu/Dockerfile.openj9.releases.full +++ b/8/jdk/ubuntu/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/Dockerfile.openj9.releases.slim b/8/jdk/ubuntu/Dockerfile.openj9.releases.slim index 41a76aae8..6feaf0a5e 100644 --- a/8/jdk/ubuntu/Dockerfile.openj9.releases.slim +++ b/8/jdk/ubuntu/Dockerfile.openj9.releases.slim @@ -27,7 +27,7 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 COPY slim-java* /usr/local/bin/ @@ -35,16 +35,16 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='4f07182f00e6d123639544c02f50d278d6908ab4416af4495c4bfaceccb0baf2'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='1c166b8a7e3e2250d2c0affb9b1fd8170128928536f01c69bc7f1dc6aa48d05d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='7aff99f87482d5bb0969f13cddecfb600e755d428ae14f4292d08d4a1ea5f080'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jdk/ubuntu/slim-java.sh b/8/jdk/ubuntu/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/ubuntu/slim-java.sh +++ b/8/jdk/ubuntu/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index 0ed0a8933..ed857c4f3 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim b/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim index 474f19aa9..ed857c4f3 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.nightly.slim @@ -17,36 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index a2ab62b0e..72d2a64fb 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/8/jdk/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -23,12 +23,12 @@ FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.zip ; \ - Write-Host ('Verifying sha256 (e0862e9978a49f162f0d50a0347a189b33f90bad98207535df1969299d0e4167) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'e0862e9978a49f162f0d50a0347a189b33f90bad98207535df1969299d0e4167') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (2405e11f9f3603e506cf7ab01fcb67a3e3a1cf3e7858e14d629a72c9a24c6c42) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '2405e11f9f3603e506cf7ab01fcb67a3e3a1cf3e7858e14d629a72c9a24c6c42') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,13 +44,9 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-8" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-8", "/openjdk-8"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index e7a17e4fe..389450c4a 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim b/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim index a1d293fc8..389450c4a 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim +++ b/8/jdk/windows/nanoserver-1809/Dockerfile.openj9.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/nanoserver-1809/slim-java.sh b/8/jdk/windows/nanoserver-1809/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/windows/nanoserver-1809/slim-java.sh +++ b/8/jdk/windows/nanoserver-1809/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index 9a5a35f48..449111ade 100644 --- a/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim b/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim index 7839b172f..449111ade 100644 --- a/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim +++ b/8/jdk/windows/nanoserver-1909/Dockerfile.hotspot.nightly.slim @@ -17,36 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '776526153ef1808b16b014607bf44a82c865df020f31a690637914fee68ccdbf') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index a0ea88323..2f02afb32 100644 --- a/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim b/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim index c5dd28c5c..2f02afb32 100644 --- a/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim +++ b/8/jdk/windows/nanoserver-1909/Dockerfile.openj9.nightly.slim @@ -17,37 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -COPY slim-java* C:/ProgramData/Java/ - -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '60e82cc1d9e6a61e1669131214ecbfce91512801e8a98da4364dd4ccfe999b19') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ - & C:/ProgramData/Java/slim-java.ps1 C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/nanoserver-1909/slim-java.sh b/8/jdk/windows/nanoserver-1909/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/windows/nanoserver-1909/slim-java.sh +++ b/8/jdk/windows/nanoserver-1909/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..71eb381b3 --- /dev/null +++ b/8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim b/8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim new file mode 100644 index 000000000..71eb381b3 --- /dev/null +++ b/8/jdk/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.slim @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..80c1425b7 --- /dev/null +++ b/8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim b/8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim new file mode 100644 index 000000000..80c1425b7 --- /dev/null +++ b/8/jdk/windows/nanoserver-20h2/Dockerfile.openj9.nightly.slim @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/nanoserver-20h2/slim-java.sh b/8/jdk/windows/nanoserver-20h2/slim-java.sh index 2a6b612c4..f13a878b3 100755 --- a/8/jdk/windows/nanoserver-20h2/slim-java.sh +++ b/8/jdk/windows/nanoserver-20h2/slim-java.sh @@ -119,6 +119,7 @@ function strip_debug_from_jar() { # Trim the files in jre/lib dir function jre_lib_files() { + local vm_impl=$(get_vm_impl) echo -n "INFO: Trimming jre/lib dir..." pushd "${target}"/jre/lib >/dev/null || return rm -rf applet/ boot/ ddr/ deploy desktop/ endorsed/ @@ -131,8 +132,8 @@ function jre_lib_files() { if [ -d "${lib_arch_dir}" ]; then pushd "${lib_arch_dir}" >/dev/null || return rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so - # Only remove the default dir for 64bit versions - if [ "${proc_type}" == "64bit" ]; then + # Only remove the default dir for 64bit versions and for hotspot + if [[ "${proc_type}" == "64bit" && "${vm_impl}" != "OpenJ9" ]]; then rm -rf default/ fi popd >/dev/null || return diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index 427cfef72..6bbb0d299 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index 81f23e908..897bde3e1 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.msi ; \ - Write-Host ('Verifying sha256 (fe137353ffa9f5b02c7783737e73ddf7668a3222b02c5d91abb8b8a2e55871ff) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe137353ffa9f5b02c7783737e73ddf7668a3222b02c5d91abb8b8a2e55871ff') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (2405e11f9f3603e506cf7ab01fcb67a3e3a1cf3e7858e14d629a72c9a24c6c42) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '2405e11f9f3603e506cf7ab01fcb67a3e3a1cf3e7858e14d629a72c9a24c6c42') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index d644d7086..3ee9ffa74 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index 73d7e8584..fa063dbe5 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ; \ - Write-Host ('Verifying sha256 (079268d9ba232091b81ef9bbf1f001e498ab7823b9def204a6fd1115e2e9d976) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '079268d9ba232091b81ef9bbf1f001e498ab7823b9def204a6fd1115e2e9d976') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3031c1332f40b397a6fce932b34179e0914795c72331e41c330c425d9f10f35a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3031c1332f40b397a6fce932b34179e0914795c72331e41c330c425d9f10f35a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/8/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index ee3918be8..71c07a83d 100644 --- a/8/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/8/jdk/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/8/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 34857eab8..537631027 100644 --- a/8/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/8/jdk/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/8/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..046bff407 --- /dev/null +++ b/8/jdk/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,51 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/8/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..351cbdddc --- /dev/null +++ b/8/jdk/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index 55eade9d8..739a311a9 100644 --- a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index dbe9bc9af..63d4a66cb 100644 --- a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (fe137353ffa9f5b02c7783737e73ddf7668a3222b02c5d91abb8b8a2e55871ff) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe137353ffa9f5b02c7783737e73ddf7668a3222b02c5d91abb8b8a2e55871ff') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (2405e11f9f3603e506cf7ab01fcb67a3e3a1cf3e7858e14d629a72c9a24c6c42) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '2405e11f9f3603e506cf7ab01fcb67a3e3a1cf3e7858e14d629a72c9a24c6c42') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index ddcf74af5..895794fde 100644 --- a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index 32cc94983..d63a8f5e3 100644 --- a/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/8/jdk/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_windows_openj9_8u282b08_openj9-0.24.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (079268d9ba232091b81ef9bbf1f001e498ab7823b9def204a6fd1115e2e9d976) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '079268d9ba232091b81ef9bbf1f001e498ab7823b9def204a6fd1115e2e9d976') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3031c1332f40b397a6fce932b34179e0914795c72331e41c330c425d9f10f35a) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3031c1332f40b397a6fce932b34179e0914795c72331e41c330c425d9f10f35a') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index 3e488cee5..51dd4d597 100644 --- a/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f8ffd0c4c42a6192f97200716cbb93b533c122cc138a747809874f38abec11f5') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'f4905fe20e635c02bf588442e5ca917921cf3da9074f50b7957947e156b80c9f') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index 00a98016b..e16b9e2fc 100644 --- a/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/8/jdk/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jdk_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '22c9a056258009427e94be465d0eeaa7f25de8b94bfb220fbf16af1bd8b5e34a') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'fc00994ba15c1aa386b5363422850f8eb34361445d2c555bb5e9bfdc65b0a1ed') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/alpine/Dockerfile.hotspot.nightly.full b/8/jre/alpine/Dockerfile.hotspot.nightly.full index 7cf30dd78..425a57c3d 100644 --- a/8/jre/alpine/Dockerfile.hotspot.nightly.full +++ b/8/jre/alpine/Dockerfile.hotspot.nightly.full @@ -60,25 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/alpine/Dockerfile.hotspot.releases.full b/8/jre/alpine/Dockerfile.hotspot.releases.full index 99bb536a1..ede33fea4 100644 --- a/8/jre/alpine/Dockerfile.hotspot.releases.full +++ b/8/jre/alpine/Dockerfile.hotspot.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/alpine/Dockerfile.openj9.nightly.full b/8/jre/alpine/Dockerfile.openj9.nightly.full index de384becf..096dc2b3b 100644 --- a/8/jre/alpine/Dockerfile.openj9.nightly.full +++ b/8/jre/alpine/Dockerfile.openj9.nightly.full @@ -60,21 +60,9 @@ RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/alpine/Dockerfile.openj9.releases.full b/8/jre/alpine/Dockerfile.openj9.releases.full index 79a57489c..5aa6e520f 100644 --- a/8/jre/alpine/Dockerfile.openj9.releases.full +++ b/8/jre/alpine/Dockerfile.openj9.releases.full @@ -54,15 +54,15 @@ RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \ && apk del --purge .build-deps glibc-i18n \ && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ apk add --no-cache --virtual .fetch-deps curl; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/centos/Dockerfile.hotspot.nightly.full b/8/jre/centos/Dockerfile.hotspot.nightly.full index d554f55c9..c36d97a2c 100644 --- a/8/jre/centos/Dockerfile.hotspot.nightly.full +++ b/8/jre/centos/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='434a5b9cbc1f7d74b4f476df109f3c4cd4acd907c8be3a046164913f473ea5a6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/centos/Dockerfile.hotspot.releases.full b/8/jre/centos/Dockerfile.hotspot.releases.full index 8392eea65..9e1b4979a 100644 --- a/8/jre/centos/Dockerfile.hotspot.releases.full +++ b/8/jre/centos/Dockerfile.hotspot.releases.full @@ -24,26 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='0f3704b3fb751ad82d95ed00c36dcf977145c8ce36d1f611039c88b88dc89e60'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/centos/Dockerfile.openj9.nightly.full b/8/jre/centos/Dockerfile.openj9.nightly.full index bee9c9eae..3ccb37dc9 100644 --- a/8/jre/centos/Dockerfile.openj9.nightly.full +++ b/8/jre/centos/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/centos/Dockerfile.openj9.releases.full b/8/jre/centos/Dockerfile.openj9.releases.full index 511943b54..6afc68f64 100644 --- a/8/jre/centos/Dockerfile.openj9.releases.full +++ b/8/jre/centos/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/clefos/Dockerfile.hotspot.nightly.full b/8/jre/clefos/Dockerfile.hotspot.nightly.full index 69c274708..116da3d78 100644 --- a/8/jre/clefos/Dockerfile.hotspot.nightly.full +++ b/8/jre/clefos/Dockerfile.hotspot.nightly.full @@ -29,25 +29,9 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/clefos/Dockerfile.hotspot.releases.full b/8/jre/clefos/Dockerfile.hotspot.releases.full index 121c0af5a..e217eda71 100644 --- a/8/jre/clefos/Dockerfile.hotspot.releases.full +++ b/8/jre/clefos/Dockerfile.hotspot.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/clefos/Dockerfile.openj9.nightly.full b/8/jre/clefos/Dockerfile.openj9.nightly.full index 68f6b7dbe..6658bfaf5 100644 --- a/8/jre/clefos/Dockerfile.openj9.nightly.full +++ b/8/jre/clefos/Dockerfile.openj9.nightly.full @@ -29,21 +29,9 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/clefos/Dockerfile.openj9.releases.full b/8/jre/clefos/Dockerfile.openj9.releases.full index 2cd7555f7..6d15a7ead 100644 --- a/8/jre/clefos/Dockerfile.openj9.releases.full +++ b/8/jre/clefos/Dockerfile.openj9.releases.full @@ -24,14 +24,14 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN yum install -y tzdata openssl curl ca-certificates fontconfig gzip tar \ && yum update -y; yum clean all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debian/Dockerfile.hotspot.nightly.full b/8/jre/debian/Dockerfile.hotspot.nightly.full index 226edeaef..4cb83e7be 100644 --- a/8/jre/debian/Dockerfile.hotspot.nightly.full +++ b/8/jre/debian/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='434a5b9cbc1f7d74b4f476df109f3c4cd4acd907c8be3a046164913f473ea5a6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debian/Dockerfile.hotspot.releases.full b/8/jre/debian/Dockerfile.hotspot.releases.full index a4300ecb7..4016de427 100644 --- a/8/jre/debian/Dockerfile.hotspot.releases.full +++ b/8/jre/debian/Dockerfile.hotspot.releases.full @@ -27,30 +27,26 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='0f3704b3fb751ad82d95ed00c36dcf977145c8ce36d1f611039c88b88dc89e60'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debian/Dockerfile.openj9.nightly.full b/8/jre/debian/Dockerfile.openj9.nightly.full index a97649b8e..fc5b62999 100644 --- a/8/jre/debian/Dockerfile.openj9.nightly.full +++ b/8/jre/debian/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debian/Dockerfile.openj9.releases.full b/8/jre/debian/Dockerfile.openj9.releases.full index 0c5a9708c..cc56a55c1 100644 --- a/8/jre/debian/Dockerfile.openj9.releases.full +++ b/8/jre/debian/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debianslim/Dockerfile.hotspot.nightly.full b/8/jre/debianslim/Dockerfile.hotspot.nightly.full index b82da5222..d625793d7 100644 --- a/8/jre/debianslim/Dockerfile.hotspot.nightly.full +++ b/8/jre/debianslim/Dockerfile.hotspot.nightly.full @@ -33,24 +33,24 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='434a5b9cbc1f7d74b4f476df109f3c4cd4acd907c8be3a046164913f473ea5a6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debianslim/Dockerfile.hotspot.releases.full b/8/jre/debianslim/Dockerfile.hotspot.releases.full index 5569a1dab..fc368ee6d 100644 --- a/8/jre/debianslim/Dockerfile.hotspot.releases.full +++ b/8/jre/debianslim/Dockerfile.hotspot.releases.full @@ -27,30 +27,26 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='0f3704b3fb751ad82d95ed00c36dcf977145c8ce36d1f611039c88b88dc89e60'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debianslim/Dockerfile.openj9.nightly.full b/8/jre/debianslim/Dockerfile.openj9.nightly.full index 309a00b9b..38ab3bac0 100644 --- a/8/jre/debianslim/Dockerfile.openj9.nightly.full +++ b/8/jre/debianslim/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/debianslim/Dockerfile.openj9.releases.full b/8/jre/debianslim/Dockerfile.openj9.releases.full index 852edf8dc..f2fc5a75f 100644 --- a/8/jre/debianslim/Dockerfile.openj9.releases.full +++ b/8/jre/debianslim/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/leap/Dockerfile.hotspot.nightly.full b/8/jre/leap/Dockerfile.hotspot.nightly.full index 9571a85cf..91cafa088 100644 --- a/8/jre/leap/Dockerfile.hotspot.nightly.full +++ b/8/jre/leap/Dockerfile.hotspot.nightly.full @@ -30,24 +30,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='434a5b9cbc1f7d74b4f476df109f3c4cd4acd907c8be3a046164913f473ea5a6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/leap/Dockerfile.hotspot.releases.full b/8/jre/leap/Dockerfile.hotspot.releases.full index 44510f469..da49bd23b 100644 --- a/8/jre/leap/Dockerfile.hotspot.releases.full +++ b/8/jre/leap/Dockerfile.hotspot.releases.full @@ -24,26 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='0f3704b3fb751ad82d95ed00c36dcf977145c8ce36d1f611039c88b88dc89e60'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/leap/Dockerfile.openj9.nightly.full b/8/jre/leap/Dockerfile.openj9.nightly.full index 749d70073..648ea9398 100644 --- a/8/jre/leap/Dockerfile.openj9.nightly.full +++ b/8/jre/leap/Dockerfile.openj9.nightly.full @@ -29,21 +29,13 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ - s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/leap/Dockerfile.openj9.releases.full b/8/jre/leap/Dockerfile.openj9.releases.full index 3875953ff..dc62c0bef 100644 --- a/8/jre/leap/Dockerfile.openj9.releases.full +++ b/8/jre/leap/Dockerfile.openj9.releases.full @@ -24,18 +24,18 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/tumbleweed/Dockerfile.hotspot.nightly.full b/8/jre/tumbleweed/Dockerfile.hotspot.nightly.full index af231b7f4..58df2123d 100644 --- a/8/jre/tumbleweed/Dockerfile.hotspot.nightly.full +++ b/8/jre/tumbleweed/Dockerfile.hotspot.nightly.full @@ -30,24 +30,24 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='434a5b9cbc1f7d74b4f476df109f3c4cd4acd907c8be3a046164913f473ea5a6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/tumbleweed/Dockerfile.hotspot.releases.full b/8/jre/tumbleweed/Dockerfile.hotspot.releases.full index d38bb8fda..fd7ed3206 100644 --- a/8/jre/tumbleweed/Dockerfile.hotspot.releases.full +++ b/8/jre/tumbleweed/Dockerfile.hotspot.releases.full @@ -24,30 +24,26 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='0f3704b3fb751ad82d95ed00c36dcf977145c8ce36d1f611039c88b88dc89e60'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/tumbleweed/Dockerfile.openj9.nightly.full b/8/jre/tumbleweed/Dockerfile.openj9.nightly.full index 0d5fc4882..0bef801c9 100644 --- a/8/jre/tumbleweed/Dockerfile.openj9.nightly.full +++ b/8/jre/tumbleweed/Dockerfile.openj9.nightly.full @@ -29,21 +29,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/tumbleweed/Dockerfile.openj9.releases.full b/8/jre/tumbleweed/Dockerfile.openj9.releases.full index 117509cfd..67760c9fc 100644 --- a/8/jre/tumbleweed/Dockerfile.openj9.releases.full +++ b/8/jre/tumbleweed/Dockerfile.openj9.releases.full @@ -24,22 +24,22 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' RUN zypper install --no-recommends -y timezone openssl curl ca-certificates fontconfig gzip tar \ && zypper update -y; zypper clean --all -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi-minimal/Dockerfile.hotspot.nightly.full b/8/jre/ubi-minimal/Dockerfile.hotspot.nightly.full index fc4f809d2..228d64696 100644 --- a/8/jre/ubi-minimal/Dockerfile.hotspot.nightly.full +++ b/8/jre/ubi-minimal/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi-minimal/Dockerfile.hotspot.releases.full b/8/jre/ubi-minimal/Dockerfile.hotspot.releases.full index 187dfe931..7fad58b97 100644 --- a/8/jre/ubi-minimal/Dockerfile.hotspot.releases.full +++ b/8/jre/ubi-minimal/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08" \ + version="jdk8u292-b10" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi-minimal/Dockerfile.openj9.nightly.full b/8/jre/ubi-minimal/Dockerfile.openj9.nightly.full index 6a9460aed..d80becb6c 100644 --- a/8/jre/ubi-minimal/Dockerfile.openj9.nightly.full +++ b/8/jre/ubi-minimal/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi-minimal/Dockerfile.openj9.releases.full b/8/jre/ubi-minimal/Dockerfile.openj9.releases.full index 6e7ecb7b7..833b60e1a 100644 --- a/8/jre/ubi-minimal/Dockerfile.openj9.releases.full +++ b/8/jre/ubi-minimal/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN microdnf install -y tzdata openssl curl ca-certificates fontconfig glibc-lan LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08_openj9-0.24.0" \ + version="jdk8u292-b10_openj9-0.26.0" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi-minimal" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi/Dockerfile.hotspot.nightly.full b/8/jre/ubi/Dockerfile.hotspot.nightly.full index 3baefbc6b..b3dc7c328 100644 --- a/8/jre/ubi/Dockerfile.hotspot.nightly.full +++ b/8/jre/ubi/Dockerfile.hotspot.nightly.full @@ -38,24 +38,20 @@ RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi/Dockerfile.hotspot.releases.full b/8/jre/ubi/Dockerfile.hotspot.releases.full index a5af46924..187b47124 100644 --- a/8/jre/ubi/Dockerfile.hotspot.releases.full +++ b/8/jre/ubi/Dockerfile.hotspot.releases.full @@ -26,32 +26,32 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08" \ + version="jdk8u292-b10" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with hotspot and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi/Dockerfile.openj9.nightly.full b/8/jre/ubi/Dockerfile.openj9.nightly.full index 1bdaff9b7..3c5f85c5f 100644 --- a/8/jre/ubi/Dockerfile.openj9.nightly.full +++ b/8/jre/ubi/Dockerfile.openj9.nightly.full @@ -37,21 +37,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubi/Dockerfile.openj9.releases.full b/8/jre/ubi/Dockerfile.openj9.releases.full index 25efd5304..f09b3431e 100644 --- a/8/jre/ubi/Dockerfile.openj9.releases.full +++ b/8/jre/ubi/Dockerfile.openj9.releases.full @@ -26,28 +26,28 @@ RUN dnf install -y tzdata openssl curl ca-certificates fontconfig glibc-langpack LABEL name="AdoptOpenJDK Java" \ vendor="AdoptOpenJDK" \ - version="jdk8u282-b08_openj9-0.24.0" \ + version="jdk8u292-b10_openj9-0.26.0" \ release="8" \ run="docker run --rm -ti /bin/bash" \ summary="AdoptOpenJDK Docker Image for OpenJDK with openj9 and ubi" \ description="For more information on this image please see https://github.com/AdoptOpenJDK/openjdk-docker/blob/master/README.md" -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubuntu/Dockerfile.hotspot.nightly.full b/8/jre/ubuntu/Dockerfile.hotspot.nightly.full index d17b109bc..8eac98ed5 100644 --- a/8/jre/ubuntu/Dockerfile.hotspot.nightly.full +++ b/8/jre/ubuntu/Dockerfile.hotspot.nightly.full @@ -33,20 +33,20 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='deafb2c5ab89c1014e4cfb4eff01e79440d1ba1a7563ef975dc067e0a805efb6'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='1740250e2d26a7872222da2595b169f9b750cf1248d3530709415d3968a99627'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_aarch64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ armhf|armv7l) \ - ESUM='68bf386d63f0b870ae697addc365d0d45ff4c22e655065e7ae396606b3a01d63'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_arm_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='434a5b9cbc1f7d74b4f476df109f3c4cd4acd907c8be3a046164913f473ea5a6'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_arm_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='d91b1fdd4323d2f30065470d6d726403b309457c2f13ef47a785e12d99d15d6b'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='7393e1743d38ecb956f732862fb1bbee58dda275f18bff0d955c5912294f3ae0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='7343722f497833e6dc0f2c09c2c39e94bc7a6183a2fb0fd78c20d8e3bf8564c8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='14c2bba2abffb3bfa3395bdb474fed989af3744aedd0bf3d99b51355b4220626'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_hotspot_2021-04-26-09-11.tar.gz'; \ LIBFFI_SUM='05e456a2e8ad9f20db846ccb96c483235c3243e27025c3e8e8e358411fd48be9'; \ LIBFFI_URL='http://launchpadlibrarian.net/354371408/libffi6_3.2.1-8_s390x.deb'; \ curl -LfsSo /tmp/libffi6.deb ${LIBFFI_URL}; \ @@ -55,8 +55,8 @@ RUN set -eux; \ rm -rf /tmp/libffi6.deb; \ ;; \ amd64|x86_64) \ - ESUM='f50c3bff8b96668b925c18aa31d793ce66945b470139346046d0bc11fa0fb35e'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_hotspot_2021-01-28-00-11.tar.gz'; \ + ESUM='0104b2cad1a85cb99ab8629ea01060bc20dc0a812444b3298cafc614873abb1f'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_hotspot_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubuntu/Dockerfile.hotspot.releases.full b/8/jre/ubuntu/Dockerfile.hotspot.releases.full index ce94b449a..439469027 100644 --- a/8/jre/ubuntu/Dockerfile.hotspot.releases.full +++ b/8/jre/ubuntu/Dockerfile.hotspot.releases.full @@ -27,26 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz'; \ - ;; \ - armhf|armv7l) \ - ESUM='0f3704b3fb751ad82d95ed00c36dcf977145c8ce36d1f611039c88b88dc89e60'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_arm_linux_hotspot_jdk8u282-b08.tar.gz'; \ + ESUM='b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ ppc64el|ppc64le) \ - ESUM='531381d69146d9df8e85f454051c552970e0b18c1fb543dc93e9a0cb2ba762ce'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='245ecd0dfde7e763c0b65028aa0440489466926be2ba018977ac9047dc328a8e'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_ppc64le_linux_hotspot_8u292b10.tar.gz'; \ ;; \ s390x) \ - ESUM='b6fcc6912feedf5cd09a32ecd1e8e1a1790f8d694680baccae1e47397e36ea52'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_s390x_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='170c12f2017c212b23c1ba47728dcf9f5f2c9f2e29abf503136a8e55f513e048'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_s390x_linux_hotspot_8u292b10.tar.gz'; \ LIBFFI_SUM='05e456a2e8ad9f20db846ccb96c483235c3243e27025c3e8e8e358411fd48be9'; \ LIBFFI_URL='http://launchpadlibrarian.net/354371408/libffi6_3.2.1-8_s390x.deb'; \ curl -LfsSo /tmp/libffi6.deb ${LIBFFI_URL}; \ @@ -55,8 +51,8 @@ RUN set -eux; \ rm -rf /tmp/libffi6.deb; \ ;; \ amd64|x86_64) \ - ESUM='3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz'; \ + ESUM='cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubuntu/Dockerfile.openj9.nightly.full b/8/jre/ubuntu/Dockerfile.openj9.nightly.full index 0ae7ccc7c..66a87aab7 100644 --- a/8/jre/ubuntu/Dockerfile.openj9.nightly.full +++ b/8/jre/ubuntu/Dockerfile.openj9.nightly.full @@ -32,21 +32,17 @@ ENV JAVA_VERSION jdk8u RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - aarch64|arm64) \ - ESUM='b97510c02c1dabb784f5aac8bf77f2782c46e285969508b7ab4c5d8ec545ff88'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_aarch64_linux_openj9_2021-01-28-00-11.tar.gz'; \ - ;; \ ppc64el|ppc64le) \ - ESUM='2559f12e32a517bd7f9c85d993630b6705de69c13c572a542b8e37a2623f4cb8'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='28121dc455137000c4e82c01a396e43d7024a15e22c9ecc8660b88eab671d4a0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_ppc64le_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ s390x) \ - ESUM='71888fd695fcada0d029ebf55295da010f0e5184cf47c0888fd73b58fc698e32'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_s390x_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='9bf95bd06ed474bdfcbe8e542928e43999e58a1d73b1a12aa6b9dc26dbabf645'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_s390x_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='fcdef6c10b19541ade6d6d54c89835237483637fd97d89b5873363b14fa00fd5'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_linux_openj9_2021-01-28-00-11.tar.gz'; \ + ESUM='83296871866305b3d200e116e7adf806033237324b0825767f6864cad309c732'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-04-26-09-11/OpenJDK8U-jre_x64_linux_openj9_2021-04-26-09-11.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/ubuntu/Dockerfile.openj9.releases.full b/8/jre/ubuntu/Dockerfile.openj9.releases.full index 48c308174..4462c718a 100644 --- a/8/jre/ubuntu/Dockerfile.openj9.releases.full +++ b/8/jre/ubuntu/Dockerfile.openj9.releases.full @@ -27,22 +27,22 @@ RUN apt-get update \ && locale-gen en_US.UTF-8 \ && rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ ppc64el|ppc64le) \ - ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ s390x) \ - ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='573e72f696d584c3559799766401a0e76e4cbc81740db38cd7415d1f5f8369c0'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_s390x_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \ - BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \ + ESUM='6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea'; \ + BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full b/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full index 1ad6c6209..6de7781e9 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full +++ b/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (bfc0cb0ca2af3c470ca07c8bf34c34686e28658bc5e230c7f5b8774fb1f98bed) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'bfc0cb0ca2af3c470ca07c8bf34c34686e28658bc5e230c7f5b8774fb1f98bed') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full b/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full index af2aa167d..1edc96302 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full +++ b/8/jre/windows/nanoserver-1809/Dockerfile.hotspot.releases.full @@ -23,12 +23,12 @@ FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_windows_hotspot_8u282b08.zip ...'); \ - curl.exe -LfsSo openjdk.zip https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_windows_hotspot_8u282b08.zip ; \ - Write-Host ('Verifying sha256 (58f2bbf0e5abc6dee7ee65431fd2fc95cdb2c3d10126045c5882f739dda79c3b) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '58f2bbf0e5abc6dee7ee65431fd2fc95cdb2c3d10126045c5882f739dda79c3b') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ @@ -36,7 +36,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r Write-Host 'Expanding Zip ...'; \ tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force @@ -44,13 +44,9 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 USER ContainerAdministrator # Set JAVA_HOME and PATH environment variables -RUN setx /M JAVA_HOME "C:\\openjdk-8" & \ +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ setx /M PATH "%PATH%;%JAVA_HOME%\\bin" -COPY --from=installer ["/openjdk-8", "/openjdk-8"] +COPY --from=installer ["/openjdk-", "/openjdk-"] USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${JAVA_HOME}\\bin" diff --git a/8/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full b/8/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full index d4e1923d9..1f5b072f0 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full +++ b/8/jre/windows/nanoserver-1809/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1809 +FROM mcr.microsoft.com/windows/servercore:1809 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (13e435fe60c177062e33484ce6885707e3ae551cb8fcdb7ff4c2dbf5b6b07894) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '13e435fe60c177062e33484ce6885707e3ae551cb8fcdb7ff4c2dbf5b6b07894') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full b/8/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full index a5a28e349..51eb027ac 100644 --- a/8/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full +++ b/8/jre/windows/nanoserver-1909/Dockerfile.hotspot.nightly.full @@ -17,33 +17,36 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (bfc0cb0ca2af3c470ca07c8bf34c34686e28658bc5e230c7f5b8774fb1f98bed) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'bfc0cb0ca2af3c470ca07c8bf34c34686e28658bc5e230c7f5b8774fb1f98bed') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" diff --git a/8/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full b/8/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full index 021104791..96432072a 100644 --- a/8/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full +++ b/8/jre/windows/nanoserver-1909/Dockerfile.openj9.nightly.full @@ -17,34 +17,37 @@ # limitations under the License. # -FROM mcr.microsoft.com/windows/nanoserver:1909 +FROM mcr.microsoft.com/windows/servercore:1909 as installer # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV JAVA_VERSION jdk8u -USER ContainerAdministrator -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.zip ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.zip -O 'openjdk.zip'; \ - Write-Host ('Verifying sha256 (13e435fe60c177062e33484ce6885707e3ae551cb8fcdb7ff4c2dbf5b6b07894) ...'); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '13e435fe60c177062e33484ce6885707e3ae551cb8fcdb7ff4c2dbf5b6b07894') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ Write-Host 'Expanding Zip ...'; \ - Expand-Archive -Path openjdk.zip -DestinationPath C:\ ; \ + tar.exe -xf openjdk.zip -C C:\ ; \ $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ - Move-Item -Path $jdkDirectory C:\openjdk-8; \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ Write-Host 'Removing openjdk.zip ...'; \ Remove-Item openjdk.zip -Force +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + USER ContainerUser -ENV JAVA_HOME=C:\\openjdk-8 \ - ProgramFiles="C:\\Program Files" \ - WindowsPATH="C:\\Windows\\system32;C:\\Windows" -ENV PATH="${WindowsPATH};${ProgramFiles}\\PowerShell;${JAVA_HOME}\\bin" -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full b/8/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..73e65100f --- /dev/null +++ b/8/jre/windows/nanoserver-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full b/8/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..2402d622e --- /dev/null +++ b/8/jre/windows/nanoserver-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,53 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 as installer + + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full b/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full index 4fbdc5ec1..0869a2b3d 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full +++ b/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full b/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full index d1c88ce5e..9659edc8d 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full +++ b/8/jre/windows/windowsservercore-1809/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_windows_hotspot_8u282b08.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_windows_hotspot_8u282b08.msi ; \ - Write-Host ('Verifying sha256 (edb227414937de5024c70eb1f50406fdcad96c4dce1c9bf866b9396dde08b462) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'edb227414937de5024c70eb1f50406fdcad96c4dce1c9bf866b9396dde08b462') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full b/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full index 40ac9b65a..c9b2d90df 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full +++ b/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full b/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full index 25b0f4118..efe3048c0 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full +++ b/8/jre/windows/windowsservercore-1809/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ...'); \ - curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ; \ - Write-Host ('Verifying sha256 (cb1ba5f2d086ac3fb6a875ac7749837c1b0a7493d988d0b2360a0f2b392255c3) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'cb1ba5f2d086ac3fb6a875ac7749837c1b0a7493d988d0b2360a0f2b392255c3') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f373d6c17e7122c22e1ded0610d42d6301e9a90fdb6721b03b31cd2adf5cb94) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f373d6c17e7122c22e1ded0610d42d6301e9a90fdb6721b03b31cd2adf5cb94') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1809 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full b/8/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full index da86d9a7d..1b7889b77 100644 --- a/8/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full +++ b/8/jre/windows/windowsservercore-1909/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full b/8/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full index 4ade51e5f..603587968 100644 --- a/8/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full +++ b/8/jre/windows/windowsservercore-1909/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:1909 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full b/8/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full new file mode 100644 index 000000000..e3dcbfbc4 --- /dev/null +++ b/8/jre/windows/windowsservercore-20h2/Dockerfile.hotspot.nightly.full @@ -0,0 +1,51 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full b/8/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full new file mode 100644 index 000000000..8e4cbbf38 --- /dev/null +++ b/8/jre/windows/windowsservercore-20h2/Dockerfile.openj9.nightly.full @@ -0,0 +1,52 @@ +# ------------------------------------------------------------------------------ +# NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# ------------------------------------------------------------------------------ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM mcr.microsoft.com/windows/servercore:20H2 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +ENV JAVA_VERSION jdk8u + +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:20H2 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full index e17aebc45..023999643 100644 --- a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full +++ b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full index 47888d2f9..d76cfdcb9 100644 --- a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full +++ b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full @@ -22,27 +22,30 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08 +ENV JAVA_VERSION jdk8u292-b10 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_windows_hotspot_8u282b08.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_windows_hotspot_8u282b08.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (edb227414937de5024c70eb1f50406fdcad96c4dce1c9bf866b9396dde08b462) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'edb227414937de5024c70eb1f50406fdcad96c4dce1c9bf866b9396dde08b462') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne 'df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full index 15bc436fa..55bdf8605 100644 --- a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full +++ b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full index 8fed1dff1..9e1be2cb8 100644 --- a/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full +++ b/8/jre/windows/windowsservercore-ltsc2016/Dockerfile.openj9.releases.full @@ -22,28 +22,31 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0 +ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0 -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_windows_openj9_8u282b08_openj9-0.24.0.msi -O 'openjdk.msi' ; \ - Write-Host ('Verifying sha256 (cb1ba5f2d086ac3fb6a875ac7749837c1b0a7493d988d0b2360a0f2b392255c3) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'cb1ba5f2d086ac3fb6a875ac7749837c1b0a7493d988d0b2360a0f2b392255c3') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (5f373d6c17e7122c22e1ded0610d42d6301e9a90fdb6721b03b31cd2adf5cb94) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '5f373d6c17e7122c22e1ded0610d42d6301e9a90fdb6721b03b31cd2adf5cb94') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - $proc.WaitForExit() ; \ - if ($proc.ExitCode -ne 0) { \ - Write-Host 'FAILED installing MSI!' ; \ - exit 1; \ - }; \ - \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2016 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal" diff --git a/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full b/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full index 7f3f6afa1..046ab2a93 100644 --- a/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full +++ b/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.hotspot.nightly.full @@ -24,20 +24,28 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_hotspot_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '557f13ba35e1c8367351b5b19ea1e4d9ba1c2156d823ede03d52f8ed7b4651dc') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '3742f4c7b487e0a49ace541bd766251bfd2ae6419c46059bfb0522ecb24780b9') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser diff --git a/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full b/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full index faf92a3ce..07f12cf11 100644 --- a/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full +++ b/8/jre/windows/windowsservercore-ltsc2019/Dockerfile.openj9.nightly.full @@ -24,21 +24,29 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV JAVA_VERSION jdk8u -RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi ...'); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u-2021-01-28-00-11/OpenJDK8U-jre_x64_windows_openj9_2021-01-28-00-11.msi -O 'openjdk.msi'; \ - Write-Host ('Verifying sha256 (845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40) ...'); \ - if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '845668306c40cb58997471d86a6d24fbed54d574e873e0a44c353b06dd365e40') { \ +RUN Write-Host ('Downloading ...'); \ + curl.exe -LfsSo openjdk.zip ; \ + Write-Host ('Verifying sha256 (862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce) ...'); \ + if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne '862bbb9d21a2bfb1765e1c3ad1dbfa2858f1fca0139ef72bc22fc03ae83436ce') { \ Write-Host 'FAILED!'; \ exit 1; \ }; \ \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - \ - Write-Host 'Installing using MSI ...'; \ - Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \ - '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \ - Remove-Item -Path C:\temp -Recurse | Out-Null; \ - Write-Host 'Removing openjdk.msi ...'; \ - Remove-Item openjdk.msi -Force -ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle" + Write-Host 'Expanding Zip ...'; \ + tar.exe -xf openjdk.zip -C C:\ ; \ + $jdkDirectory=(Get-ChildItem -Directory | ForEach-Object { $_.FullName } | Select-String 'jdk'); \ + Move-Item -Path $jdkDirectory C:\openjdk-; \ + Write-Host 'Removing openjdk.zip ...'; \ + Remove-Item openjdk.zip -Force + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2019 + +USER ContainerAdministrator +# Set JAVA_HOME and PATH environment variables +RUN setx /M JAVA_HOME "C:\\openjdk-" & \ + setx /M PATH "%PATH%;%JAVA_HOME%\\bin" + +COPY --from=installer ["/openjdk-", "/openjdk-"] + +USER ContainerUser +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"