Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 589, Adding AlmaLinux support - config, scripts, document changes #592

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Fix 589, Adding AlmaLinux support - config, scripts, document changes #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6ee3ed
Adding AlmaLinux to config files
srbala Jun 29, 2021
7ec402b
Adding AlmaLinux to script files
srbala Jun 29, 2021
bf1f4b1
Updated test scripts for AlmaLinux
srbala Jun 29, 2021
887e6dc
Updated documentation for AlmaLinux
srbala Jun 29, 2021
bfd56c2
Merge README.md changes
srbala Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Dockerfiles and build scripts for generating Docker Images based on various Adop

* Supported Linux OSes

| Alpine | centos | clefos | debian | debianslim | leap | tumbleweed | ubi | ubi-minimal | ubuntu(*) |
|:------:|:------:|:------:|:------:|:------------:|:----:|:----------:|:---:|:-----------:|:------:|
| 3.14 | 7 | 7 | buster | buster-slim | 15.3 | latest | 8.4 | 8.4 | 20.04 |
| AlmaLinux | Alma-mini | Alpine | centos | clefos | debian | debianslim | leap | tumbleweed | ubi | ubi-minimal | ubuntu(*) |
|:---------:|:---------:|:------:|:------:|:------:|:------:|:------------:|:----:|:----------:|:---:|:-----------:|:------:|
| 8.4 | 8.4 | 3.14 | 7 | 7 | buster | buster-slim | 15.3 | latest | 8.4 | 8.4 | 20.04 |

Note: Hotspot is not supported on Ubuntu 20.04 for s390x arch.

Expand All @@ -34,6 +34,8 @@ AdoptOpenJDK Docker Images are available as both Official Images (Maintained by
- Windows Server Core (ltsc2016 and 1809): Release
* [Unofficial Images](https://hub.docker.com/u/adoptopenjdk) are maintained by AdoptOpenJDK and updated on a nightly basis. Supported OSes and their versions and type of images are as below.
- Linux
- AlmaLinux (8.4): Release, Nightly and Slim
- AlmaLinux-Minimal (8.4): Release and Nightly
- Alpine (3.14): Release, Nightly and Slim
- CentOS (7): Release, Nightly and Slim
- ClefOS (7): Release, Nightly and Slim
Expand Down
4 changes: 2 additions & 2 deletions common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function set_arch_os() {
;;
aarch64)
current_arch="aarch64"
oses="centos debian debianslim leap tumbleweed ubi ubi-minimal ubuntu"
oses="alma alma-minimal centos debian debianslim leap tumbleweed ubi ubi-minimal ubuntu"
os_family="linux"
;;
ppc64el|ppc64le)
Expand Down Expand Up @@ -145,7 +145,7 @@ function set_arch_os() {
# shellcheck disable=SC2034 # used externally
current_arch="x86_64"
# shellcheck disable=SC2034 # used externally
oses="alpine centos debian debianslim leap tumbleweed ubi ubi-minimal ubuntu"
oses="alma alma-minimal alpine centos debian debianslim leap tumbleweed ubi ubi-minimal ubuntu"
# alpine-linux (musl libc) based builds are only available on x86_64 currently
# shellcheck disable=SC2034 # used externally
os_family="alpine-linux linux"
Expand Down
98 changes: 97 additions & 1 deletion config/hotspot.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.
#

OS: alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 windowsservercore-20h2 nanoserver-20h2
OS: alma alma-minimal alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 windowsservercore-20h2 nanoserver-20h2
Versions: 8 11 15 16

Build: releases nightly
Expand Down Expand Up @@ -45,6 +45,18 @@ Architectures: aarch64 armv7l x86_64 ppc64le
OS_Family: linux
Directory: 8/jdk/centos

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 8/jdk/alma

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 8/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: s390x
Expand Down Expand Up @@ -147,6 +159,18 @@ Architectures: aarch64 x86_64 ppc64le s390x
OS_Family: linux
Directory: 8/jre/ubi

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 8/jre/alma

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 8/jre/alma-minimal

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
Expand Down Expand Up @@ -255,6 +279,18 @@ Architectures: aarch64 x86_64 ppc64le s390x
OS_Family: linux
Directory: 11/jdk/ubi

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 11/jdk/alma

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 11/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le
Expand Down Expand Up @@ -371,6 +407,18 @@ Directory: 11/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 11/jre/alma

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 11/jre/alma-minimal

uild: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
OS_Family: linux
Directory: 11/jre/centos
Expand Down Expand Up @@ -479,6 +527,18 @@ Architectures: aarch64 x86_64 ppc64le s390x
OS_Family: linux
Directory: 15/jdk/ubi-minimal

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 15/jdk/alma

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 15/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le
Expand Down Expand Up @@ -587,6 +647,18 @@ Architectures: aarch64 x86_64 ppc64le s390x
OS_Family: linux
Directory: 15/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 15/jre/alma

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 15/jre/alma-minimal

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
Expand Down Expand Up @@ -697,6 +769,18 @@ Architectures: aarch64 x86_64 ppc64le s390x
OS_Family: linux
Directory: 16/jdk/ubi-minimal

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 16/jdk/alma

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 16/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le
Expand Down Expand Up @@ -805,6 +889,18 @@ Architectures: aarch64 x86_64 ppc64le s390x
OS_Family: linux
Directory: 16/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 16/jre/alma

Build: releases nightly
Type: full
Architectures: aarch64 x86_64
OS_Family: linux
Directory: 16/jre/alma-minimal

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
Expand Down
86 changes: 85 additions & 1 deletion config/openj9.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# The images referred in this file are built and maintained by AdoptOpenJDK
# and pushed to the https://hub.docker.com/u/adoptopenjdk repo

OS: alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 windowsservercore-20h2 nanoserver-20h2
OS: alma alma-minimal alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 windowsservercore-20h2 nanoserver-20h2
Versions: 8 11 15 16

Build: releases nightly
Expand All @@ -41,6 +41,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 8/jdk/ubi

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 8/jdk/alma

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 8/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: x86_64 ppc64le
Expand Down Expand Up @@ -155,6 +167,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 8/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: x86_64
OS_Family: linux
Directory: 8/jre/alma

Build: releases nightly
Type: full
Architectures: x86_64
OS_Family: linux
Directory: 8/jre/alma-minimal

Build: releases nightly
Type: full
Architectures: x86_64 ppc64le
Expand Down Expand Up @@ -257,6 +281,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 11/jdk/ubi

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 11/jdk/alma

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 11/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: x86_64 ppc64le
Expand Down Expand Up @@ -481,6 +517,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 15/jdk/ubi-minimal

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 15/jdk/alma

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 15/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: x86_64 ppc64le
Expand Down Expand Up @@ -589,6 +637,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 15/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: x86_64
OS_Family: linux
Directory: 15/jre/alma

Build: releases nightly
Type: full
Architectures: x86_64
OS_Family: linux
Directory: 15/jre/alma-minimal

Build: releases nightly
Type: full
Architectures: x86_64 ppc64le
Expand Down Expand Up @@ -699,6 +759,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 16/jdk/ubi-minimal

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 16/jdk/alma

Build: releases nightly
Type: full slim
Architectures: x86_64
OS_Family: linux
Directory: 16/jdk/alma-minimal

Build: releases nightly
Type: full slim
Architectures: x86_64 ppc64le
Expand Down Expand Up @@ -807,6 +879,18 @@ Architectures: x86_64 ppc64le s390x
OS_Family: linux
Directory: 16/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: x86_64
OS_Family: linux
Directory: 16/jre/alma

Build: releases nightly
Type: full
Architectures: x86_64
OS_Family: linux
Directory: 16/jre/alma-minimal

Build: releases nightly
Type: full
Architectures: x86_64 ppc64le
Expand Down
16 changes: 16 additions & 0 deletions config/tags.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ ubi-minimal-jdk-releases-slim-tags: ubi-minimal-slim {{ JDK_RELEASES_VER }}-ubi-
ubi-minimal-jdk-nightly-full-tags: ubi-minimal-nightly {{ JDK_NIGHTLY_VER }}-ubi-minimal-nightly {{ ARCH }}-ubi-minimal-{{ JDK_NIGHTLY_VER }}-nightly
ubi-minimal-jdk-nightly-slim-tags: ubi-minimal-nightly-slim {{ JDK_NIGHTLY_VER }}-ubi-minimal-nightly-slim {{ ARCH }}-ubi-minimal-{{ JDK_NIGHTLY_VER }}-nightly-slim

alma-jdk-releases-full-tags: alma {{ JDK_RELEASES_VER }}-alma {{ ARCH }}-alma-{{ JDK_RELEASES_VER }}
alma-jdk-releases-slim-tags: alma-slim {{ JDK_RELEASES_VER }}-alma-slim {{ ARCH }}-alma-{{ JDK_RELEASES_VER }}-slim
alma-jdk-nightly-full-tags: alma-nightly {{ JDK_NIGHTLY_VER }}-alma-nightly {{ ARCH }}-alma-{{ JDK_NIGHTLY_VER }}-nightly
alma-jdk-nightly-slim-tags: alma-nightly-slim {{ JDK_NIGHTLY_VER }}-alma-nightly-slim {{ ARCH }}-alma-{{ JDK_NIGHTLY_VER }}-nightly-slim

alma-minimal-jdk-releases-full-tags: alma-minimal {{ JDK_RELEASES_VER }}-alma-minimal {{ ARCH }}-alma-minimal-{{ JDK_RELEASES_VER }}
alma-minimal-jdk-releases-slim-tags: alma-minimal-slim {{ JDK_RELEASES_VER }}-alma-minimal-slim {{ ARCH }}-alma-minimal-{{ JDK_RELEASES_VER }}-slim
alma-minimal-jdk-nightly-full-tags: alma-minimal-nightly {{ JDK_NIGHTLY_VER }}-alma-minimal-nightly {{ ARCH }}-alma-minimal-{{ JDK_NIGHTLY_VER }}-nightly
alma-minimal-jdk-nightly-slim-tags: alma-minimal-nightly-slim {{ JDK_NIGHTLY_VER }}-alma-minimal-nightly-slim {{ ARCH }}-alma-minimal-{{ JDK_NIGHTLY_VER }}-nightly-slim

centos-jdk-releases-full-tags: centos {{ JDK_RELEASES_VER }}-centos {{ ARCH }}-centos-{{ JDK_RELEASES_VER }}
centos-jdk-releases-slim-tags: centos-slim {{ JDK_RELEASES_VER }}-centos-slim {{ ARCH }}-centos-{{ JDK_RELEASES_VER }}-slim
centos-jdk-nightly-full-tags: centos-nightly {{ JDK_NIGHTLY_VER }}-centos-nightly {{ ARCH }}-centos-{{ JDK_NIGHTLY_VER }}-nightly
Expand Down Expand Up @@ -91,6 +101,12 @@ ubi-jre-nightly-full-tags: ubi-jre-nightly {{ JDK_NIGHTLY_VER }}-ubi-nightly {{
ubi-minimal-jre-releases-full-tags: ubi-minimal-jre {{ JDK_RELEASES_VER }}-ubi-minimal {{ ARCH }}-ubi-minimal-{{ JDK_RELEASES_VER }}
ubi-minimal-jre-nightly-full-tags: ubi-minimal-jre-nightly {{ JDK_NIGHTLY_VER }}-ubi-minimal-nightly {{ ARCH }}-ubi-minimal-{{ JDK_NIGHTLY_VER }}-nightly

alma-jre-releases-full-tags: alma-jre {{ JDK_RELEASES_VER }}-alma {{ ARCH }}-alma-{{ JDK_RELEASES_VER }}
alma-jre-nightly-full-tags: alma-jre-nightly {{ JDK_NIGHTLY_VER }}-alma-nightly {{ ARCH }}-alma-{{ JDK_NIGHTLY_VER }}-nightly

alma-minimal-jre-releases-full-tags: alma-minimal-jre {{ JDK_RELEASES_VER }}-alma-minimal {{ ARCH }}-alma-minimal-{{ JDK_RELEASES_VER }}
alma-minimal-jre-nightly-full-tags: alma-minimal-jre-nightly {{ JDK_NIGHTLY_VER }}-alma-minimal-nightly {{ ARCH }}-alma-minimal-{{ JDK_NIGHTLY_VER }}-nightly

centos-jre-releases-full-tags: centos-jre {{ JDK_RELEASES_VER }}-centos {{ ARCH }}-centos-{{ JDK_RELEASES_VER }}
centos-jre-nightly-full-tags: centos-jre-nightly {{ JDK_NIGHTLY_VER }}-centos-nightly {{ ARCH }}-centos-{{ JDK_NIGHTLY_VER }}-nightly

Expand Down
Loading