From f99cf0fefd18275352603db493539f400eef7d4f Mon Sep 17 00:00:00 2001 From: Justin Carter Date: Sat, 8 Jul 2023 09:40:51 +0800 Subject: [PATCH] update readme for latest release --- README.md | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 9f07ec0..99ed6fb 100644 --- a/README.md +++ b/README.md @@ -13,24 +13,24 @@ **Tomcat 9.0 with Java 11 (recommended)** -- `5.4.0.80-tomcat9.0-jre11-temurin-jammy`, `5.4.0.80`, **`5.4`**, **`latest`** ([Dockerfile](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile)) - - `5.4.0.80-nginx-tomcat9.0-jre11-temurin-jammy`, `5.4.0.80-nginx`, **`5.4-nginx`** ([Dockerfile.nginx](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile.nginx)) +- `5.4.1.8-tomcat9.0-jre11-temurin-jammy`, `5.4.1.8`, **`5.4`**, **`latest`** ([Dockerfile](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile)) + - `5.4.1.8-nginx-tomcat9.0-jre11-temurin-jammy`, `5.4.1.8-nginx`, **`5.4-nginx`** ([Dockerfile.nginx](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile.nginx)) Tomcat 9.0 with Java 8 -- `5.4.0.80-tomcat9.0-jre8-temurin-jammy`, ([Dockerfile](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile)) - - `5.4.0.80-nginx-tomcat9.0-jre8-temurin-jammy` ([Dockerfile.nginx](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile.nginx)) +- `5.4.1.8-tomcat9.0-jre8-temurin-jammy`, ([Dockerfile](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile)) + - `5.4.1.8-nginx-tomcat9.0-jre8-temurin-jammy` ([Dockerfile.nginx](https://github.com/lucee/lucee-dockerfiles/blob/master/Dockerfile.nginx)) ## How the tags work -The Lucee Docker image tags follow a naming convention which is used to produce "simple tags" that are updated with each release (e.g. `5.3`, `5.3-nginx`) as well as "full tags" which allow for very specific version targeting (e.g. `5.4.0.80-tomcat9.0-jre11-temurin-jammy`). +The Lucee Docker image tags follow a naming convention which is used to produce "simple tags" that are updated with each release (e.g. `5.4`, `5.4-nginx`) as well as "full tags" which allow for very specific version targeting (e.g. `5.4.1.8-tomcat9.0-jre11-temurin-jammy`). The tag naming convention is; `LUCEE_VERSION[-RELEASE_TYPE][-light][-nginx][-TOMCAT_VERSION-JRE_VERSION]` -- `LUCEE_VERSION` is the Lucee Version number string. For simple tags it may optionally be in the `MAJOR.MINOR` format (e.g. `5.3`) and for full tags it's in the `MAJOR.MINOR.PATCH.BUILD` format (e.g. `5.4.0.80`). Snapshot, RC and Beta builds always include the full version number. +- `LUCEE_VERSION` is the Lucee Version number string. For simple tags it may optionally be in the `MAJOR.MINOR` format (e.g. `5.4`) and for full tags it's in the `MAJOR.MINOR.PATCH.BUILD` format (e.g. `5.4.1.8`). Snapshot, RC and Beta builds always include the full version number. - `RELEASE_TYPE` is the type of release; omitted for Releases, otherwise `SNAPSHOT`, `RC` or `BETA` - `-light` (optional) is a build with the Lucee "Light" JAR file, WITHOUT any extensions (users must install extensions separately, this includes database drivers, ORM, ESAPI, S3, image handling, etc) - `-nginx` (optional) is a build with the NGINX web server bundled and configured @@ -54,14 +54,14 @@ Tomcat 9.0 with OpenJDK 8 ### Bleeding edge Snapshot / RC / Beta (6.0) -- `5.4.1.2-SNAPSHOT-tomcat9.0-jre11-temurin-jammy`, `5.4.1.2-SNAPSHOT` - - `5.4.1.2-SNAPSHOT-nginx-tomcat9.0-jre11-temurin-jammy`, `5.4.1.2-SNAPSHOT-nginx` -- `6.0.0.481-RC-tomcat9.0-jre11-temurin-jammy`, `6.0.0.481-RC` - - `6.0.0.481-RC-nginx-tomcat9.0-jre11-temurin-jammy`, `6.0.0.481-RC-nginx` +- `5.4.1.4-SNAPSHOT-tomcat9.0-jre11-temurin-jammy`, `5.4.1.4-SNAPSHOT` + - `5.4.1.4-SNAPSHOT-nginx-tomcat9.0-jre11-temurin-jammy`, `5.4.1.4-SNAPSHOT-nginx` +- `6.0.0.503-RC-tomcat9.0-jre11-temurin-jammy`, `6.0.0.503-RC` + - `6.0.0.503-RC-nginx-tomcat9.0-jre11-temurin-jammy`, `6.0.0.503-RC-nginx` - `6.0.0.451-BETA-tomcat9.0-jre11-temurin-jammy`, `6.0.0.451-BETA` - `6.0.0.451-BETA-nginx-tomcat9.0-jre11-temurin-jammy`, `6.0.0.451-BETA-nginx` -The `SNAPSHOTS` Docker image builds are automatically generated after a successful Lucee build. The `5.4.1.2-SNAPSHOT` version number above is an example of the latest SNAPSHOT version number; check the [Docker Hub tags](https://hub.docker.com/r/lucee/lucee/tags) and/or the [Lucee Downloads](https://download.lucee.org/) page to see the latest SNAPSHOT version numbers. +The `SNAPSHOTS` Docker image builds are automatically generated after a successful Lucee build. The `5.4.1.4-SNAPSHOT` version number above is an example of the latest SNAPSHOT version number; check the [Docker Hub tags](https://hub.docker.com/r/lucee/lucee/tags) and/or the [Lucee Downloads](https://download.lucee.org/) page to see the latest SNAPSHOT version numbers. The `RC` and `Beta` builds are manually triggered when they are announced. @@ -72,24 +72,19 @@ For more information about Lucee versions and extensions see the [Lucee Download For the latest stable release with Tomcat only: ``` -FROM lucee/lucee:5.3 +FROM lucee/lucee:5.4 -# Lucee configs COPY config/lucee/ /opt/lucee/web/ -# Code COPY www /var/www ``` For the latest stable release with NGINX and Tomcat: ``` -FROM lucee/lucee:5.3-nginx +FROM lucee/lucee:5.4-nginx -# NGINX configs COPY config/nginx/ /etc/nginx/ -# Lucee configs COPY config/lucee/ /opt/lucee/web/ -# Code COPY www /var/www ``` @@ -164,7 +159,7 @@ export LUCEE_MINOR=5.4 export LUCEE_SERVER=,-nginx export LUCEE_VARIANTS= -export LUCEE_VERSION=5.4.0.80 +export LUCEE_VERSION=5.4.1.8 ``` Then use the default builder with buildx and run the `build-images` script using a single target platform only (matching your native platform), e.g. @@ -176,7 +171,7 @@ docker buildx use default Specify the newly built image tag in a Docker Compose file to run and test the container image with `docker-compose up`; ``` lucee: - image: lucee/lucee:5.4.0.80 + image: lucee/lucee:5.4.1.8 ports: - "8854:8888" - "8054:80"