rename all ubi9 folders to redhat, change image tags to rhel, add Lucee 7 images and bump 6 version, remove Adobe 2021 images

Author: jclausen

.github/workflows/pull-request.yml

@@ -39,22 +39,22 @@ jobs:
             BUILD_IMAGE_TAG: boxlang
 
           # ubi9 Builds
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Base.Dockerfile
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Base.Dockerfile
             BUILD_IMAGE_TAG: ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Base.Dockerfile
-            BUILD_IMAGE_TAG: jre11-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/base/ubi9.JDK11.Dockerfile
-            BUILD_IMAGE_TAG: jdk11-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee5.Dockerfile
-            BUILD_IMAGE_TAG: lucee5-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/LuceeLight.Dockerfile
-            BUILD_IMAGE_TAG: lucee-light-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2018.Dockerfile
-            BUILD_IMAGE_TAG: adobe2018-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2021.Dockerfile
-            BUILD_IMAGE_TAG: adobe2021-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/BoxLang.Dockerfile
-            BUILD_IMAGE_TAG: boxlang-ubi9
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Base.Dockerfile
+            BUILD_IMAGE_TAG: jre11-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/base/rhel.JDK11.Dockerfile
+            BUILD_IMAGE_TAG: jdk11-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Lucee5.Dockerfile
+            BUILD_IMAGE_TAG: lucee5-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/LuceeLight.Dockerfile
+            BUILD_IMAGE_TAG: lucee-light-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Adobe2018.Dockerfile
+            BUILD_IMAGE_TAG: adobe2018-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Adobe2021.Dockerfile
+            BUILD_IMAGE_TAG: adobe2021-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/BoxLang.Dockerfile
+            BUILD_IMAGE_TAG: boxlang-rhel
 
           # Alpine builds
           # Note: No JDK builders currently support alpine with ARM

.github/workflows/release.yml

@@ -40,12 +40,12 @@ jobs:
             BUILD_IMAGE_TAG: lucee5
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Lucee6.Dockerfile
             BUILD_IMAGE_TAG: lucee6
+          - BUILD_IMAGE_DOCKERFILE: builds/debian/Lucee7.Dockerfile
+            BUILD_IMAGE_TAG: lucee7
           - BUILD_IMAGE_DOCKERFILE: builds/debian/LuceeLight.Dockerfile
             BUILD_IMAGE_TAG: lucee-light
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Lucee5Light.Dockerfile
             BUILD_IMAGE_TAG: lucee5-light
-          - BUILD_IMAGE_DOCKERFILE: builds/debian/Adobe2021.Dockerfile
-            BUILD_IMAGE_TAG: adobe2021
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Adobe2023.Dockerfile
             BUILD_IMAGE_TAG: adobe2023
           - BUILD_IMAGE_DOCKERFILE: builds/debian/Adobe2025.Dockerfile
@@ -54,34 +54,34 @@ jobs:
             BUILD_IMAGE_TAG: boxlang
 
           # ubi9 Builds
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Base.Dockerfile
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Base.Dockerfile
             BUILD_IMAGE_TAG: ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Base.Dockerfile
-            BUILD_IMAGE_TAG: jre11-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/base/ubi9.JDK11.Dockerfile
-            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
-            BUILD_IMAGE_TAG: lucee5-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee6.Dockerfile
-            BUILD_IMAGE_TAG: lucee6-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/LuceeLight.Dockerfile
-            BUILD_IMAGE_TAG: lucee-light-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Lucee5Light.Dockerfile
-            BUILD_IMAGE_TAG: lucee5-light-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2021.Dockerfile
-            BUILD_IMAGE_TAG: adobe2021-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2023.Dockerfile
-            BUILD_IMAGE_TAG: adobe2023-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/Adobe2025.Dockerfile
-            BUILD_IMAGE_TAG: adobe2025-ubi9
-          - BUILD_IMAGE_DOCKERFILE: builds/ubi9/BoxLang.Dockerfile
-            BUILD_IMAGE_TAG: boxlang-ubi9
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Base.Dockerfile
+            BUILD_IMAGE_TAG: jre11-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/base/rhel.JDK11.Dockerfile
+            BUILD_IMAGE_TAG: jdk11-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/base/rhel.JDK17.Dockerfile
+            BUILD_IMAGE_TAG: jdk17-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/base/rhel.JDK21.Dockerfile
+            BUILD_IMAGE_TAG: jdk21-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/base/rhel.JRE17.Dockerfile
+            BUILD_IMAGE_TAG: jre17-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Lucee5.Dockerfile
+            BUILD_IMAGE_TAG: lucee5-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Lucee6.Dockerfile
+            BUILD_IMAGE_TAG: lucee6-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Lucee7.Dockerfile
+            BUILD_IMAGE_TAG: lucee7-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/LuceeLight.Dockerfile
+            BUILD_IMAGE_TAG: lucee-light-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Lucee5Light.Dockerfile
+            BUILD_IMAGE_TAG: lucee5-light-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Adobe2023.Dockerfile
+            BUILD_IMAGE_TAG: adobe2023-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/Adobe2025.Dockerfile
+            BUILD_IMAGE_TAG: adobe2025-rhel
+          - BUILD_IMAGE_DOCKERFILE: builds/redhat/BoxLang.Dockerfile
+            BUILD_IMAGE_TAG: boxlang-rhel
 
           # Alpine builds
           # Note: No JDK builders currently support alpine with ARM
@@ -103,12 +103,12 @@ jobs:
             BUILD_IMAGE_TAG: lucee5-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Lucee6.Dockerfile
             BUILD_IMAGE_TAG: lucee6-alpine
+          - BUILD_IMAGE_DOCKERFILE: builds/alpine/Lucee7.Dockerfile
+            BUILD_IMAGE_TAG: lucee7-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/LuceeLight.Dockerfile
             BUILD_IMAGE_TAG: lucee-light-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Lucee5Light.Dockerfile
             BUILD_IMAGE_TAG: lucee5-light-alpine
-          - BUILD_IMAGE_DOCKERFILE: builds/alpine/Adobe2021.Dockerfile
-            BUILD_IMAGE_TAG: adobe2021-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Adobe2023.Dockerfile
             BUILD_IMAGE_TAG: adobe2023-alpine
           - BUILD_IMAGE_DOCKERFILE: builds/alpine/Adobe2025.Dockerfile
@@ -135,7 +135,7 @@ jobs:
           DOCKER_IMAGE: ortussolutions/commandbox
           BUILD_IMAGE_TAG: ${{ matrix.BUILD_IMAGE_TAG }}
           COMMANDBOX_VERSION: 6.2.1
-          IMAGE_VERSION: 3.13.7
+          IMAGE_VERSION: 3.14.8
         run: |
           # Tag Builds
           if [[ $GITHUB_REF == refs/tags/* ]]; then

README.md

@@ -42,7 +42,7 @@ All images are published to [Docker Hub](https://hub.docker.com/r/ortussolutions
 - **Multi-Engine Support**: Run BoxLang Applications or CFML engines, including Lucee and Adobe ColdFusion, in a single container.
 - **Customizable**: Easily configure your server environment using `server.json` or environment variables.
 - **Pre-Built Engines**: Includes pre-built images with warmed-up engines to reduce startup times.
-- **Alpine and UBI9 Variants**: Lightweight Alpine Linux and RHEL Universal Base Image (UBI9) variants for optimized performance and security.
+- **Alpine and UBI9 Variants**: Lightweight Alpine Linux and RHEL Universal Base Image (UBI10) variants for optimized performance and security.
 - **Health Checks**: Built-in health checks to ensure your server is running smoothly.
 - **Docker Secrets Support**: Use Docker secrets for secure configuration management.
 - **Environment Variables**: Extensive support for environment variables to customize your server configuration at runtime.
@@ -76,7 +76,7 @@ _Note: For references to the specific versions of CommandBox used within image v
 - `:boxlang` - BoxLang runtime ready (JDK 21)
 - `:lucee6` - Lucee 6.x warmed up (JDK 11)
 - `:adobe2025` - Adobe ColdFusion 2025 (JDK 21)
-- `:[version]` - Specific tagged version (e.g., `:3.13.4`)
+- `:[version]` - Specific tagged version (e.g., `:3.13.8`)
 - `:[tag]-snapshot` - Development version of tagged variations
 
 #### JDK/JRE Variants (Debian)
@@ -100,11 +100,11 @@ _Note: For references to the specific versions of CommandBox used within image v
 
 #### RHEL Universal Base Image (UBI9) Variants
 
-- `:ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/ubi9.Dockerfile)) - RHEL UBI9 (JDK 11)
-- `:ubi9-jdk11` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/ubi9.JDK11.Dockerfile)) - UBI9 with JDK 11
-- `:ubi9-jre17` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/ubi9.JRE17.Dockerfile)) - UBI9 with JRE 17
-- `:ubi9-jdk17` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/ubi9.JDK17.Dockerfile)) - UBI9 with JDK 17
-- `:ubi9-jdk21` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/ubi9.JDK21.Dockerfile)) - UBI9 with JDK 21
+- `:ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/rhel.Dockerfile)) - RHEL UBI9 (JDK 11)
+- `:ubi9-jdk11` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/rhel.JDK11.Dockerfile)) - UBI9 with JDK 11
+- `:ubi9-jre17` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/rhel.JRE17.Dockerfile)) - UBI9 with JRE 17
+- `:ubi9-jdk17` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/rhel.JDK17.Dockerfile)) - UBI9 with JDK 17
+- `:ubi9-jdk21` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/base/rhel.JDK21.Dockerfile)) - UBI9 with JDK 21
 
 ### Pre-Built Engine Images (Warmed Up)
 
@@ -114,7 +114,7 @@ These images include pre-downloaded and warmed-up engines to significantly reduc
 
 - `:boxlang` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/debian/BoxLang.Dockerfile)) - BoxLang on Debian
 - `:boxlang-alpine` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/alpine/BoxLang.Dockerfile)) - BoxLang on Alpine
-- `:boxlang-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/BoxLang.Dockerfile)) - BoxLang on UBI9
+- `:boxlang-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/BoxLang.Dockerfile)) - BoxLang on UBI9
 
 #### Lucee CFML Engine
 
@@ -135,10 +135,10 @@ These images include pre-downloaded and warmed-up engines to significantly reduc
 
 **UBI9-based Lucee Images:**
 
-- `:lucee5-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Lucee5.Dockerfile)) - Lucee 5.x on UBI9
-- `:lucee6-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Lucee6.Dockerfile)) - Lucee 6.x on UBI9
-- `:lucee-light-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/LuceeLight.Dockerfile)) - Lucee Light on UBI9
-- `:lucee5-light-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Lucee5Light.Dockerfile)) - Lucee 5.x Light on UBI9
+- `:lucee5-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Lucee5.Dockerfile)) - Lucee 5.x on UBI9
+- `:lucee6-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Lucee6.Dockerfile)) - Lucee 6.x on UBI9
+- `:lucee-light-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/LuceeLight.Dockerfile)) - Lucee Light on UBI9
+- `:lucee5-light-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Lucee5Light.Dockerfile)) - Lucee 5.x Light on UBI9
 
 #### Adobe ColdFusion Engine
 
@@ -160,18 +160,18 @@ These images include pre-downloaded and warmed-up engines to significantly reduc
 
 **UBI9-based Adobe Images:**
 
-- `:adobe2018-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Adobe2018.Dockerfile)) - Adobe ColdFusion 2018 on UBI9
-- `:adobe2021-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Adobe2021.Dockerfile)) - Adobe ColdFusion 2021 on UBI9
-- `:adobe2023-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Adobe2023.Dockerfile)) - Adobe ColdFusion 2023 on UBI9
-- `:adobe2025-ubi9` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/ubi9/Adobe2025.Dockerfile)) - Adobe ColdFusion 2025 on UBI9
+- `:adobe2018-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Adobe2018.Dockerfile)) - Adobe ColdFusion 2018 on UBI9
+- `:adobe2021-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Adobe2021.Dockerfile)) - Adobe ColdFusion 2021 on UBI9
+- `:adobe2023-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Adobe2023.Dockerfile)) - Adobe ColdFusion 2023 on UBI9
+- `:adobe2025-rhel` ([Dockerfile](https://github.com/Ortus-Solutions/docker-commandbox/blob/master/builds/redhat/Adobe2025.Dockerfile)) - Adobe ColdFusion 2025 on UBI9
 
 ### Choosing the Right Tag
 
 - **For BoxLang applications**: Use `:boxlang` variants
 - **For CFML Warmed Up Engines**: Use `:lucee6` or `:adobe2025` for the latest engines
 - **For production**: Use specific engine tags with your preferred base OS
 - **For smaller images**: Use `-alpine` variants
-- **For enterprise/RHEL environments**: Use `-ubi9` variants
+- **For enterprise/RHEL environments**: Use `-rhel` variants
 - **For development**: Use `:snapshot` for bleeding edge features
 
 _**Note**: The `:latest` tag currently uses OpenJDK11, as do most pre-built engine images. BoxLang and Adobe2025 images use JDK21. If you require specific JDK versions, use the appropriate JDK variant tags._

build/util/ubi9/install-dependencies.sh build/util/redhat/install-dependencies.shbuild/util/ubi9/install-dependencies.sh renamed to build/util/redhat/install-dependencies.sh

@@ -1,10 +1,10 @@
 # syntax = edrevo/dockerfile-plus
-INCLUDE+ builds/base/Alpine.Dockerfile
+INCLUDE+ builds/base/Alpine.JRE17.Dockerfile
 
 LABEL maintainer "Jon Clausen <[email protected]>"
 LABEL repository "https://github.com/Ortus-Solutions/docker-commandbox"
 
-ENV BOX_SERVER_APP_CFENGINE [email protected].1+122
+ENV BOX_SERVER_APP_CFENGINE [email protected].3+35
 
 ENV LUCEE_EXTENSIONS D062D72F-F8A2-46F0-8CBC91325B2F067B;version=6.5.2
 

build/util/ubi9/install-filebeat.sh build/util/redhat/install-filebeat.shbuild/util/ubi9/install-filebeat.sh renamed to build/util/redhat/install-filebeat.sh

@@ -0,0 +1,12 @@
+# syntax = edrevo/dockerfile-plus
+INCLUDE+ builds/base/Alpine.JDK21.Dockerfile
+
+LABEL maintainer "Jon Clausen <[email protected]>"
+LABEL repository "https://github.com/Ortus-Solutions/docker-commandbox"
+
+ENV BOX_SERVER_APP_CFENGINE [email protected]+395
+
+ENV LUCEE_EXTENSIONS D062D72F-F8A2-46F0-8CBC91325B2F067B;version=6.5.2
+
+# WARM UP THE SERVER - we skip the declaration so that the default installed Lucee server will be used
+RUN ${BUILD_DIR}/util/warmup-server.sh

builds/alpine/Adobe2018.Dockerfile

@@ -1,5 +1,4 @@
-FROM eclipse-temurin:17-jre-ubi9-minimal
-
+FROM eclipse-temurin:25-jdk-noble
 ARG COMMANDBOX_VERSION
 
 LABEL maintainer "Jon Clausen <[email protected]>"
@@ -11,8 +10,6 @@ ENV LANG C.UTF-8
 # Since alpine runs as a single user, we need to create a "root" direcotry
 ENV HOME /root
 
-RUN microdnf install -y shadow-utils util-linux
-
 # Add a working group which any dynamic users can be assigned
 ENV WORKGROUP runwar
 RUN groupadd $WORKGROUP && usermod -a -G $WORKGROUP root
@@ -46,21 +43,20 @@ RUN chown -R $(whoami):${WORKGROUP} $BUILD_DIR
 
 # Basic Dependencies
 RUN rm -rf $BUILD_DIR/util/alpine
-RUN rm -rf $BUILD_DIR/util/debian
-
-RUN ${BUILD_DIR}/util/ubi9/install-dependencies.sh
+RUN rm -rf $BUILD_DIR/util/ubi9
+RUN ${BUILD_DIR}/util/debian/install-dependencies.sh
 
 # Commandbox Installation
 RUN $BUILD_DIR/util/install-commandbox.sh
 
 # Add our custom classes added in the previous step to the java classpath
 ENV CLASSPATH="$JAVA_HOME/classes"
 
+
 # Default Port Environment Variables
 ENV PORT 8080
 ENV SSL_PORT 8443
 
-
 # Healthcheck environment variables
 ENV HEALTHCHECK_URI "http://127.0.0.1:${PORT}/"