Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-06 15:09:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

8.5.70-debian-10-r10 release

Browse Source
This commit is contained in:
Bitnami Bot
2021-08-26 19:02:48 +00:00
parent 8c703c327e
commit 32722a090b
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/tomcat/8.5/debian-10/Dockerfile
View File

@@ -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

2
bitnami/tomcat/8.5/debian-10/docker-compose.yml
View File

@@ -6,7 +6,7 @@ services:
ports:
- '8080:8080'
volumes:
- 'tomcat_data:/bitnami'
- 'tomcat_data:/bitnami/tomcat'
environment:
- ALLOW_EMPTY_PASSWORD=yes

10
bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/libtomcat.sh
View File

@@ -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
}
########################

2
bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh
View File

@@ -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

2
bitnami/tomcat/8.5/debian-10/rootfs/opt/bitnami/scripts/tomcat/setup.sh
View File

@@ -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

2
bitnami/tomcat/README.md
View File

@@ -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).