From 025883a1ae3a06d47c5c63b19fa227c5e9e1435e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 10 Dec 2024 02:08:43 +0100 Subject: [PATCH] [bitnami/spring-cloud-skipper] Release spring-cloud-skipper-2.11.5-debian-12-r4 (#75652) Signed-off-by: Bitnami Bot --- bitnami/spring-cloud-skipper/2/debian-12/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh | 5 +++++ .../rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh | 2 ++ bitnami/spring-cloud-skipper/README.md | 5 +++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bitnami/spring-cloud-skipper/2/debian-12/Dockerfile b/bitnami/spring-cloud-skipper/2/debian-12/Dockerfile index 087af26b686c..a722b6269d7b 100644 --- a/bitnami/spring-cloud-skipper/2/debian-12/Dockerfile +++ b/bitnami/spring-cloud-skipper/2/debian-12/Dockerfile @@ -9,11 +9,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-11-10T00:07:38Z" \ + org.opencontainers.image.created="2024-12-10T00:40:20Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-skipper/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.5-debian-12-r3" \ + org.opencontainers.image.ref.name="2.11.5-debian-12-r4" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-skipper" \ org.opencontainers.image.title="spring-cloud-skipper" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -30,7 +30,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "yq-4.44.3-6-linux-${OS_ARCH}-debian-12" \ + "yq-4.44.6-0-linux-${OS_ARCH}-debian-12" \ "java-21.0.5-11-1-linux-${OS_ARCH}-debian-12" \ "spring-cloud-skipper-2.11.5-1-linux-${OS_ARCH}-debian-12" \ ) ; \ diff --git a/bitnami/spring-cloud-skipper/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-skipper/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index b569af56339c..4390e1720b13 100644 --- a/bitnami/spring-cloud-skipper/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-skipper/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "4.44.3-6" + "version": "4.44.6-0" } } \ No newline at end of file diff --git a/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh index 8557631d2549..38802fc0bfe9 100755 --- a/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh +++ b/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh @@ -13,6 +13,11 @@ set -o pipefail . /opt/bitnami/scripts/libbitnami.sh . /opt/bitnami/scripts/liblog.sh +if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then + # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9 + unset JAVA_TOOL_OPTIONS +fi + print_welcome_page echo "" diff --git a/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh b/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh index ef18d056ded9..23aadb713e8f 100644 --- a/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh +++ b/bitnami/spring-cloud-skipper/2/debian-12/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh @@ -30,6 +30,7 @@ spring_cloud_skipper_env_vars=( SPRING_CLOUD_KUBERNETES_CONFIG_NAME SPRING_CLOUD_KUBERNETES_SECRETS_PATHS JAVA_OPTS + JAVA_TOOL_OPTIONS ) for env_var in "${spring_cloud_skipper_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -64,5 +65,6 @@ export SPRING_CLOUD_KUBERNETES_SECRETS_PATHS="${SPRING_CLOUD_KUBERNETES_SECRETS_ # Java settings export JAVA_OPTS="${JAVA_OPTS:-}" +export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS:-}" # Custom environment variables may be defined below diff --git a/bitnami/spring-cloud-skipper/README.md b/bitnami/spring-cloud-skipper/README.md index f4e4bd7c094b..c3a1ebef8d85 100644 --- a/bitnami/spring-cloud-skipper/README.md +++ b/bitnami/spring-cloud-skipper/README.md @@ -29,11 +29,11 @@ Deploying Bitnami applications as Helm Charts is the easiest way to get started ## Why use a non-root container? -Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-work-with-non-root-containers-index.html). +Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-work-with-non-root-containers-index.html). ## Supported tags and respective `Dockerfile` links -Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html). +Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html). You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. @@ -75,6 +75,7 @@ docker build -t bitnami/APP:latest . | `SPRING_CLOUD_KUBERNETES_CONFIG_NAME` | Name of the ConfigMap that contains the configuration. | `nil` | | `SPRING_CLOUD_KUBERNETES_SECRETS_PATHS` | Paths where the secrets are going to be mount. | `nil` | | `JAVA_OPTS` | JVM options | `nil` | +| `JAVA_TOOL_OPTIONS` | Java tool options. | `nil` | #### Read-only environment variables