From 1dbb603806016923c023709c09945cf593382ec7 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 22 Jan 2024 13:33:55 +0100 Subject: [PATCH] [bitnami/tomcat] Release 10.1.18-debian-11-r1 (#55263) Signed-off-by: Bitnami Containers --- bitnami/tomcat/10.1/debian-11/Dockerfile | 11 ++-- .../opt/bitnami/.bitnami_components.json | 2 +- bitnami/tomcat/README.md | 56 ++++++++++++++----- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/bitnami/tomcat/10.1/debian-11/Dockerfile b/bitnami/tomcat/10.1/debian-11/Dockerfile index b8da55ed1f65..840724968546 100644 --- a/bitnami/tomcat/10.1/debian-11/Dockerfile +++ b/bitnami/tomcat/10.1/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-10T18:27:58Z" \ + org.opencontainers.image.created="2024-01-22T10:38:27Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.1.18-debian-11-r0" \ + org.opencontainers.image.ref.name="10.1.18-debian-11-r1" \ org.opencontainers.image.title="tomcat" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.1.18" @@ -27,9 +27,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libssl1.1 procps xmlstarlet zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.9-11-6-linux-${OS_ARCH}-debian-11" \ - "tomcat-10.1.18-0-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.10-13-0-linux-${OS_ARCH}-debian-11" \ + "tomcat-10.1.18-0-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -44,6 +44,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh @@ -51,7 +52,7 @@ RUN /opt/bitnami/scripts/tomcat/postunpack.sh ENV APP_VERSION="10.1.18" \ BITNAMI_APP_NAME="tomcat" \ JAVA_HOME="/opt/bitnami/java" \ - PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:$PATH" EXPOSE 8009 8080 diff --git a/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a34469a21473..d631ef779ce9 100644 --- a/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tomcat/10.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.9-11-6" + "version": "17.0.10-13-0" }, "render-template": { "arch": "amd64", diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index 3f130cd47d50..86c4a883ab1e 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -10,8 +10,7 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema ## TL;DR ```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/tomcat/docker-compose.yml > docker-compose.yml -docker-compose up -d +docker run --name tomcat bitnami/tomcat:latest ``` You can find the default credentials and available configuration options in the [Environment Variables](#environment-variables) section. @@ -141,18 +140,43 @@ Access your web server in the browser by navigating to `http://localhost:8080`. ### Environment variables -The Apache Tomcat instance can be customized by specifying environment variables on the first run. The following environment values are provided to custom Apache Tomcat: +#### Customizable environment variables -* `TOMCAT_SHUTDOWN_PORT_NUMBER`: Apache Tomcat shutdown port. Default: **8005** -* `TOMCAT_HTTP_PORT_NUMBER`: Apache Tomcat HTTP port. Default: **8080** -* `TOMCAT_AJP_PORT_NUMBER`: Apache Tomcat AJP port. Default: **8009** -* `TOMCAT_USERNAME`: Apache Tomcat user. Default: **manager** -* `TOMCAT_PASSWORD`: Apache Tomcat password. No defaults. -* `TOMCAT_ALLOW_REMOTE_MANAGEMENT`: Whether to allow connections from remote addresses to the Apache Tomcat manager application. Default: **no** -* `TOMCAT_ENABLE_AUTH`: Whether to enable authentication for Apache Tomcat manager application. Default: **yes** -* `TOMCAT_ENABLE_AJP`: Whether to enable the Apache Tomcat AJP connector. Default: **no** -* `TOMCAT_EXTRA_JAVA_OPTS`: Additional Java settings for Apache Tomcat. No defaults. -* `TOMCAT_INSTALL_DEFAULT_WEBAPPS`: Whether to add default webapps (ROOT, manager, host-manager, etc.) for deployment. Default: **yes** +| Name | Description | Default Value | +|----------------------------------|---------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `TOMCAT_SHUTDOWN_PORT_NUMBER` | Tomcat shutdown port number. | `8005` | +| `TOMCAT_HTTP_PORT_NUMBER` | Tomcat HTTP port number. | `8080` | +| `TOMCAT_AJP_PORT_NUMBER` | Tomcat AJP port number. | `8009` | +| `TOMCAT_USERNAME` | Tomcat username. | `manager` | +| `TOMCAT_ALLOW_REMOTE_MANAGEMENT` | Whether to allow connections from remote addresses to the Tomcat manager application. | `yes` | +| `TOMCAT_ALLOW_REMOTE_MANAGEMENT` | Whether to allow connections from remote addresses to the Tomcat manager application. | `no` | +| `TOMCAT_ENABLE_AUTH` | Whether to enable authentication for Tomcat manager applications. | `yes` | +| `TOMCAT_ENABLE_AJP` | Whether to enable the Tomcat AJP connector. | `no` | +| `TOMCAT_START_RETRIES` | The number or retries while waiting for Catalina to start. | `12` | +| `TOMCAT_INSTALL_DEFAULT_WEBAPPS` | Whether to add default webapps (ROOT, manager, host-manager, etc.) for deployment. | `yes` | +| `JAVA_OPTS` | Java runtime parameters. | `-Djava.awt.headless=true -XX:+UseG1GC -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -Duser.home=${TOMCAT_HOME}` | + +#### Read-only environment variables + +| Name | Description | Value | +|--------------------------|----------------------------------------------------|---------------------------------------| +| `TOMCAT_BASE_DIR` | Tomcat installation directory. | `${BITNAMI_ROOT_DIR}/tomcat` | +| `TOMCAT_VOLUME_DIR` | Tomcat persistence directory. | `/bitnami/tomcat` | +| `TOMCAT_BIN_DIR` | Tomcat directory for binary files. | `${TOMCAT_BASE_DIR}/bin` | +| `TOMCAT_LIB_DIR` | Tomcat directory for library files. | `${TOMCAT_BASE_DIR}/lib` | +| `TOMCAT_WORK_DIR` | Tomcat directory for runtime files. | `${TOMCAT_BASE_DIR}/work` | +| `TOMCAT_WEBAPPS_DIR` | Tomcat directory where webapps are stored. | `${TOMCAT_VOLUME_DIR}/webapps` | +| `TOMCAT_CONF_DIR` | Tomcat configuration directory. | `${TOMCAT_BASE_DIR}/conf` | +| `TOMCAT_CONF_FILE` | Tomcat configuration file. | `${TOMCAT_CONF_DIR}/server.xml` | +| `TOMCAT_USERS_CONF_FILE` | Tomcat configuration file. | `${TOMCAT_CONF_DIR}/tomcat-users.xml` | +| `TOMCAT_LOGS_DIR` | Directory where Tomcat logs are stored. | `${TOMCAT_BASE_DIR}/logs` | +| `TOMCAT_TMP_DIR` | Directory where Tomcat temporary files are stored. | `${TOMCAT_BASE_DIR}/temp` | +| `TOMCAT_LOG_FILE` | Path to the log file for Tomcat. | `${TOMCAT_LOGS_DIR}/catalina.out` | +| `TOMCAT_PID_FILE` | Path to the PID file for Tomcat. | `${TOMCAT_TMP_DIR}/catalina.pid` | +| `TOMCAT_HOME` | Tomcat home directory. | `$TOMCAT_BASE_DIR` | +| `TOMCAT_DAEMON_USER` | Tomcat system user. | `tomcat` | +| `TOMCAT_DAEMON_GROUP` | Tomcat system group. | `tomcat` | +| `JAVA_HOME` | Java installation folder. | `${BITNAMI_ROOT_DIR}/java` | #### Creating a custom user @@ -300,6 +324,12 @@ docker-compose up tomcat * All volumes have been merged at `/bitnami/tomcat`. Now you only need to mount a single volume at `/bitnami/tomcat` for persistence. * The logs are always sent to the `stdout` and are no longer collected in the volume. +## Using `docker-compose.yaml` + +Please be aware this file has not undergone internal testing. Consequently, we advise its use exclusively for development or testing purposes. For production-ready deployments, we highly recommend utilizing its associated [Bitnami Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/tomcat). + +If you detect any issue in the `docker-compose.yaml` file, feel free to report it or contribute with a fix by following our [Contributing Guidelines](https://github.com/bitnami/containers/blob/main/CONTRIBUTING.md). + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.