#153 added Debian Bullseye support to Corretto and AdoptOpenJDK

Author: Fran Tsao

.travis.yml

@@ -39,9 +39,11 @@ env:
   - DOCKER_IMAGE_BASE=centos:7 JDK_MAJOR=11 JDK_VERSION=11.0.12.0.7 DOCKER_TAG_TO_PUBLISH=11.0.12.0.7-centos7-openjdk-headless
   - DOCKER_IMAGE_BASE=centos:8 JDK_MAJOR=11 JDK_VERSION=11.0.12.0.7 DOCKER_TAG_TO_PUBLISH=11.0.12.0.7-centos8-openjdk-headless
   # adoptopenjdk
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3 DOCKER_TAG_TO_PUBLISH=8u292-bullseye-adoptopenjdk-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3 DOCKER_TAG_TO_PUBLISH=8u292-buster-adoptopenjdk-headless
   - DOCKER_IMAGE_BASE=centos:8 JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292_b10 DOCKER_TAG_TO_PUBLISH=8u292-centos8-adoptopenjdk-headless
   # corretto
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1 DOCKER_TAG_TO_PUBLISH=8u302-bullseye-corretto-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1 DOCKER_TAG_TO_PUBLISH=8u302-buster-corretto-headless
   - DOCKER_IMAGE_BASE=centos:8 JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1.8.0_302.b08 DOCKER_TAG_TO_PUBLISH=8u302-centos8-corretto-headless
 script:

molecule/adoptopenjdk/Dockerfile.j2

@@ -8,7 +8,7 @@ FROM {{ item.image }}
 
 RUN mkdir -p /usr/share/man/man1
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \

molecule/corretto/Dockerfile.j2

@@ -8,7 +8,7 @@ FROM {{ item.image }}
 
 RUN mkdir -p /usr/share/man/man1
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \

vars/adoptopenjdk/Debian-11.yml

@@ -0,0 +1,17 @@
+---
+java_open_jdk_apt_extra_packages:
+  - python3-apt
+  - apt-transport-https
+  - gnupg2
+__java_open_jdk_version_major: 8
+# Supported major releases: 8 and from 11 to 14; hotspot and openj9 implementations
+
+# For Debian family
+__java_required_libs_openjdk: []
+__java_required_repositories_openjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main
+__java_open_jdk_home_dir: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot-amd64
+
+__java_required_key_repositories_openjdk:
+  - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+__java_open_jdk_package: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot

vars/corretto/Debian-11.yml

@@ -0,0 +1,17 @@
+---
+java_open_jdk_apt_extra_packages:
+  - python3-apt
+  - apt-transport-https
+  - gnupg2
+
+__java_open_jdk_version_major: 1.8.0
+# Supported versions: 8 (1.8.0L), 11
+
+__java_required_repositories_openjdk:
+  - deb https://apt.corretto.aws stable main
+__java_required_key_repositories_openjdk:
+  - https://apt.corretto.aws/corretto.key
+__java_required_libs_openjdk: []
+__java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk
+
+__java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto