diff --git a/bitnami/tomcat/10/debian-11/Dockerfile b/bitnami/tomcat/10/debian-11/Dockerfile index c959ff25373a..9bfd355c18be 100644 --- a/bitnami/tomcat/10/debian-11/Dockerfile +++ b/bitnami/tomcat/10/debian-11/Dockerfile @@ -5,11 +5,11 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="10.0.23-debian-11-r24" \ + org.opencontainers.image.ref.name="10.1.0-debian-11-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \ org.opencontainers.image.title="tomcat" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="10.0.23" + org.opencontainers.image.version="10.1.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -19,39 +19,23 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 libssl1.1 procps xmlstarlet zlib1g +RUN install_packages ca-certificates curl libssl1.1 procps xmlstarlet zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz java-11.0.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz tomcat-10.0.23-4-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ - fi && \ - sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + COMPONENTS=( \ + "java-11.0.16-1-linux-${OS_ARCH}-debian-11" \ + "tomcat-10.1.0-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \ + "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \ + ) && \ + for COMPONENT in "${COMPONENTS[@]}"; do \ + if [ ! -f "${COMPONENT}.tar.gz" ]; then \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ + fi && \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \ + done 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 @@ -60,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="10.0.23" \ +ENV APP_VERSION="10.1.0" \ BITNAMI_APP_NAME="tomcat" \ 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-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5e0d5ce987e5..2e4c967eb2bb 100644 --- a/bitnami/tomcat/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tomcat/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,30 +1,30 @@ { "gosu": { "arch": "amd64", - "digest": "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab", + "digest": "f21869b27c26b9c3053bce8b419a0fdf1dc45fcf13a7c2058e0afb6996d3687f", "distro": "debian-11", "type": "NAMI", - "version": "1.14.0-154" + "version": "1.14.0-155" }, "java": { "arch": "amd64", - "digest": "98cbaca6fc1aca76fdbfc11ee57d05924adc956401396375c4be43c5c671dca5", + "digest": "c375579c55ee13d9561dcfaeba0338a6c2f5233dc386ead63dbbb67cc974fcdb", "distro": "debian-11", "type": "NAMI", - "version": "11.0.16-0" + "version": "11.0.16-1" }, "render-template": { "arch": "amd64", - "digest": "c1f2cdabdcc920512e8936ab2c8a033e1aeb97801fa026f0b12432581bf849ae", + "digest": "cb0a32f121f58797a77247fe41ae2b9f9b705bdf170f55015963c667edca6360", "distro": "debian-11", "type": "NAMI", - "version": "1.0.3-153" + "version": "1.0.3-154" }, "tomcat": { "arch": "amd64", - "digest": "0ff3aa64652ceaafdd15035f85ae11083dd3094a6308967b4534381dcafeddd8", + "digest": "50f7d3c62d6395f1d244df5ec4b762b9a286cf062a8c330be784640ac8311c52", "distro": "debian-11", "type": "NAMI", - "version": "10.0.23-4" + "version": "10.1.0-1" } } \ No newline at end of file diff --git a/bitnami/tomcat/10/debian-11/tags-info.yaml b/bitnami/tomcat/10/debian-11/tags-info.yaml index bbc34b04ad19..3b20ce3fd73f 100644 --- a/bitnami/tomcat/10/debian-11/tags-info.yaml +++ b/bitnami/tomcat/10/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "10" - "10-debian-11" - - "10.0.23" + - "10.1.0" - "latest" diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index 21b2e5c9ade7..269406216801 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -41,7 +41,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-11`, `10.0.23`, `10.0.23-debian-11-r24`, `latest` (10/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/10/debian-11/Dockerfile) +* [`10`, `10-debian-11`, `10.1.0`, `10.1.0-debian-11-r0`, `latest` (10/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/10/debian-11/Dockerfile) * [`9.0`, `9.0-debian-11`, `9.0.67`, `9.0.67-debian-11-r3` (9.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/9.0/debian-11/Dockerfile) * [`8.5`, `8.5-debian-11`, `8.5.82`, `8.5.82-debian-11-r19` (8.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/tomcat/8.5/debian-11/Dockerfile)