diff --git a/bitnami/tomcat/10/debian-10/Dockerfile b/bitnami/tomcat/10/debian-10/Dockerfile index 6f1fff85cf53..8c9e1baba2e4 100644 --- a/bitnami/tomcat/10/debian-10/Dockerfile +++ b/bitnami/tomcat/10/debian-10/Dockerfile @@ -24,7 +24,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh ENV APP_VERSION="10.0.18" \ BITNAMI_APP_NAME="tomcat" \ - BITNAMI_IMAGE_VERSION="10.0.18-debian-10-r10" \ + BITNAMI_IMAGE_VERSION="10.0.18-debian-10-r11" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 503650210583..818c2158032b 100644 --- a/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -392,10 +392,6 @@ web_server_update_app_configuration() { --hosts \ | --server-name \ | --server-aliases \ - | --enable-http \ - | --enable-https \ - | --disable-http \ - | --disable-https \ | --http-port \ | --https-port \ ) diff --git a/bitnami/tomcat/10/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh b/bitnami/tomcat/10/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh index 904c13fa73f1..8d14cb5528ab 100644 --- a/bitnami/tomcat/10/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh +++ b/bitnami/tomcat/10/debian-10/rootfs/opt/bitnami/scripts/tomcat-env.sh @@ -9,6 +9,7 @@ # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) # Load logging library +# shellcheck disable=SC1090,SC1091 . /opt/bitnami/scripts/liblog.sh export BITNAMI_ROOT_DIR="/opt/bitnami" diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index 76be08c5faf7..6da5716d4a24 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`10`, `10-debian-10`, `10.0.18`, `10.0.18-debian-10-r10`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.18-debian-10-r10/10/debian-10/Dockerfile) +* [`10`, `10-debian-10`, `10.0.18`, `10.0.18-debian-10-r11`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.18-debian-10-r11/10/debian-10/Dockerfile) * [`9.0`, `9.0-debian-10`, `9.0.60`, `9.0.60-debian-10-r11` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.60-debian-10-r11/9.0/debian-10/Dockerfile) * [`8.5`, `8.5-debian-10`, `8.5.77`, `8.5.77-debian-10-r9` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.77-debian-10-r9/8.5/debian-10/Dockerfile)