From 32722a090b2f1b360a7b919a6b83f70f4d4662d7 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 26 Aug 2021 19:02:48 +0000 Subject: [PATCH] 8.5.70-debian-10-r10 release --- bitnami/tomcat/8.5/debian-10/Dockerfile | 2 +- bitnami/tomcat/8.5/debian-10/docker-compose.yml | 2 +- .../debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh | 10 +++++----- .../debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh | 2 ++ .../rootfs/opt/bitnami/scripts/tomcat/setup.sh | 2 +- bitnami/tomcat/README.md | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bitnami/tomcat/8.5/debian-10/Dockerfile b/bitnami/tomcat/8.5/debian-10/Dockerfile index 214bf1e32354..909fa457179b 100644 --- a/bitnami/tomcat/8.5/debian-10/Dockerfile +++ b/bitnami/tomcat/8.5/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/tomcat/postunpack.sh ENV BITNAMI_APP_NAME="tomcat" \ - BITNAMI_IMAGE_VERSION="8.5.70-debian-10-r9" \ + BITNAMI_IMAGE_VERSION="8.5.70-debian-10-r10" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8009 8080 diff --git a/bitnami/tomcat/8.5/debian-10/docker-compose.yml b/bitnami/tomcat/8.5/debian-10/docker-compose.yml index 41cf2bfd2312..460746316187 100644 --- a/bitnami/tomcat/8.5/debian-10/docker-compose.yml +++ b/bitnami/tomcat/8.5/debian-10/docker-compose.yml @@ -6,7 +6,7 @@ services: ports: - '8080:8080' volumes: - - 'tomcat_data:/bitnami' + - 'tomcat_data:/bitnami/tomcat' environment: - ALLOW_EMPTY_PASSWORD=yes diff --git a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh index d50058b98fc1..d42af0850771 100644 --- a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh +++ b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh @@ -36,11 +36,12 @@ tomcat_validate() { } check_conflicting_ports() { local -r total="$#" - for i in $(seq 1 "$((total - 1))"); do for j in $(seq "$((i + 1))" "$total"); do - if (("${!i}" == "${!j}")); then - print_validation_error "${!i} and ${!j} are bound to the same port" + var_i="${!i}" + var_j="${!j}" + if [[ -n "${!var_i:-}" ]] && [[ -n "${!var_j:-}" ]] && [[ "${!var_i:-}" = "${!var_j:-}" ]]; then + print_validation_error "${var_i} and ${var_j} are bound to the same port" fi done done @@ -219,8 +220,7 @@ tomcat_start_bg() { error "Tomcat failed to start with exit code ${start_error}" return "$start_error" fi - - wait_for_log_entry "Catalina.start Server startup" "$TOMCAT_LOG_FILE" + wait_for_log_entry "Catalina.start Server startup" "$TOMCAT_LOG_FILE" "$TOMCAT_START_RETRIES" 10 } ######################## diff --git a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh index b9346f38b202..9711a5716967 100644 --- a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh +++ b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh @@ -29,6 +29,7 @@ tomcat_env_vars=( TOMCAT_ALLOW_REMOTE_MANAGEMENT TOMCAT_ENABLE_AUTH TOMCAT_ENABLE_AJP + TOMCAT_START_RETRIES TOMCAT_EXTRA_JAVA_OPTS ) for env_var in "${tomcat_env_vars[@]}"; do @@ -73,6 +74,7 @@ export TOMCAT_PASSWORD="${TOMCAT_PASSWORD:-}" export TOMCAT_ALLOW_REMOTE_MANAGEMENT="${TOMCAT_ALLOW_REMOTE_MANAGEMENT:-no}" export TOMCAT_ENABLE_AUTH="${TOMCAT_ENABLE_AUTH:-yes}" export TOMCAT_ENABLE_AJP="${TOMCAT_ENABLE_AJP:-no}" +export TOMCAT_START_RETRIES="${TOMCAT_START_RETRIES:-12}" export TOMCAT_EXTRA_JAVA_OPTS="${TOMCAT_EXTRA_JAVA_OPTS:-}" # Default JVM configuration diff --git a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat/setup.sh b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat/setup.sh index f0ffeb4a4458..1602bdffa70d 100755 --- a/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat/setup.sh +++ b/bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat/setup.sh @@ -15,7 +15,7 @@ set -o pipefail # Load Tomcat environment variables . /opt/bitnami/scripts/tomcat-env.sh -# Ensure tomcat environment variables are valid +# Ensure Tomcat environment variables are valid tomcat_validate # Ensure tomcat is initialized diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index a88a116d9b5d..3a6fcc9676db 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10`, `10-debian-10`, `10.0.10`, `10.0.10-debian-10-r20` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.10-debian-10-r20/10/debian-10/Dockerfile) * [`9.0`, `9.0-debian-10`, `9.0.52`, `9.0.52-debian-10-r19`, `latest` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.52-debian-10-r19/9.0/debian-10/Dockerfile) -* [`8.5`, `8.5-debian-10`, `8.5.70`, `8.5.70-debian-10-r9` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.70-debian-10-r9/8.5/debian-10/Dockerfile) +* [`8.5`, `8.5-debian-10`, `8.5.70`, `8.5.70-debian-10-r10` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.70-debian-10-r10/8.5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/tomcat GitHub repo](https://github.com/bitnami/bitnami-docker-tomcat).