From 338b8137e88d4cb69185fc8ce76ae525a9032795 Mon Sep 17 00:00:00 2001
From: jclausen <jclausen@ortussolutions.com>
Date: Wed, 26 Jun 2024 14:54:41 -0400
Subject: [PATCH] add arm support for alpine jdk 21

---
 .github/workflows/release.yml | 8 +++++++-
 changelog.md                  | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d25ef6a..5c8f9de 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,6 +22,8 @@ jobs:
             BUILD_IMAGE_TAG: jdk11
           - BUILD_IMAGE_DOCKERFILE: builds/base/JDK17.Dockerfile
             BUILD_IMAGE_TAG: jdk17
+          - BUILD_IMAGE_DOCKERFILE: builds/base/JDK21.Dockerfile
+            BUILD_IMAGE_TAG: jdk21
           - BUILD_IMAGE_DOCKERFILE: builds/base/JRE17.Dockerfile
             BUILD_IMAGE_TAG: jre17
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Base.JDK8.Dockerfile
@@ -50,6 +52,8 @@ jobs:
             BUILD_IMAGE_TAG: jdk11-ubi9
           - BUILD_IMAGE_DOCKERFILE: builds/base/ubi9.JDK17.Dockerfile
             BUILD_IMAGE_TAG: jdk17-ubi9
+          - BUILD_IMAGE_DOCKERFILE: builds/base/ubi9.JDK21.Dockerfile
+            BUILD_IMAGE_TAG: jdk21-ubi9
           - BUILD_IMAGE_DOCKERFILE: builds/base/ubi9.JRE17.Dockerfile
             BUILD_IMAGE_TAG: jre17-ubi9
           - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee5.Dockerfile
@@ -77,6 +81,8 @@ jobs:
             BUILD_IMAGE_TAG: jdk11-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/base/Alpine.JDK17.Dockerfile
             BUILD_IMAGE_TAG: jdk17-alpine
+          - BUILD_IMAGE_DOCKERFILE: builds/base/Alpine.JDK21.Dockerfile
+            BUILD_IMAGE_TAG: jdk21-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/base/Alpine.JRE17.Dockerfile
             BUILD_IMAGE_TAG: jre17-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Base.JDK8.Dockerfile
@@ -135,7 +141,7 @@ jobs:
 
           TAGS="${DOCKER_IMAGE}:${BUILD_IMAGE_TAG}"
 
-          if [[ ${BUILD_IMAGE_TAG} == *"alpine"* ]]; then
+          if [[ ${BUILD_IMAGE_TAG} == *"alpine"* ]] && ![[ ${BUILD_IMAGE_TAG} != @(jd21-alpine|boxlang-alpine) ]]; then
             ARCH_PLATFORMS=linux/amd64
           else
             ARCH_PLATFORMS=linux/amd64,linux/arm64/v8
diff --git a/changelog.md b/changelog.md
index 05fb260..acca900 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 ## [Unreleased]
+### Added
+* Add JDK21 builds for Alpine, UBI, and Ubuntu
+* Add BoxLang containers
 
 ## [6.0.0/3.9.4] - 2024-05-03
 ### Changed