From 36ad255ef5b23a1ce6cc3f45add549fb8ad16ab9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 21 Oct 2021 06:08:32 +0000 Subject: [PATCH] 2.9.0-debian-10-r8 release --- .../2/debian-10/Dockerfile | 4 +- .../opt/bitnami/.bitnami_components.json | 4 +- .../opt/bitnami/scripts/libservice.sh | 7 ++- .../opt/bitnami/scripts/libwebserver.sh | 43 +++++++++++++++---- bitnami/spring-cloud-dataflow/README.md | 2 +- 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile index 7c2ee5bc9484..d2932ba87911 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 procps tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.302-0" --checksum 59c0b7440797c7110c76959dbbce5235359b52adf62f99218b2718c04f2d67b6 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.312-0" --checksum a7e034898281dff05591e74de285ecd69899ddaaff4ce1ea9c09556ac89c9c72 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.13.4-0" --checksum e8e4175266f100a9a74b9cbdcb44867581c4648d83735ed42e04c3fb89d38009 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-dataflow" "2.9.0-0" --checksum e01146ed09175796e5cee6ef3037262b08dda6713febb61d90fe83dbec7df1fe RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/spring-cloud-dataflow/postunpack.sh ENV BITNAMI_APP_NAME="spring-cloud-dataflow" \ - BITNAMI_IMAGE_VERSION="2.9.0-debian-10-r7" \ + BITNAMI_IMAGE_VERSION="2.9.0-debian-10-r8" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" USER 1001 diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 75c92e41dd97..f21f19a52da3 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "java": { "arch": "amd64", - "digest": "59c0b7440797c7110c76959dbbce5235359b52adf62f99218b2718c04f2d67b6", + "digest": "a7e034898281dff05591e74de285ecd69899ddaaff4ce1ea9c09556ac89c9c72", "distro": "debian-10", "type": "NAMI", - "version": "1.8.302-0" + "version": "1.8.312-0" }, "spring-cloud-dataflow": { "arch": "amd64", diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index 0b96a0be09e0..a713bd108e15 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -158,7 +158,7 @@ remove_cron_conf() { # $3 - Start command # $4 - Stop command # Flags: -# --disabled - Whether to disable the monit configuration +# --disable - Whether to disable the monit configuration # Returns: # None ######################### @@ -174,9 +174,8 @@ generate_monit_conf() { shift 4 while [[ "$#" -gt 0 ]]; do case "$1" in - --disabled) - shift - disabled="$1" + --disable) + disabled="yes" ;; *) echo "Invalid command line flag ${1}" >&2 diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index dc322c377b1b..785d883f325e 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -164,11 +164,14 @@ web_server_reload() { # Arguments: # $1 - App name # Flags: -# --hosts - Hosts to enable # --type - Application type, which has an effect on which configuration template to use +# --hosts - Host listen addresses +# --server-name - Server name +# --server-aliases - Server aliases # --allow-remote-connections - Whether to allow remote connections or to require local connections -# --disabled - Whether to render the file with a .disabled prefix -# --enable-https - Enable app configuration on HTTPS port +# --disable - Whether to render server configurations with a .disabled prefix +# --disable-http - Whether to render the app's HTTP server configuration with a .disabled prefix +# --disable-https - Whether to render the app's HTTPS server configuration with a .disabled prefix # --http-port - HTTP port number # --https-port - HTTPS port number # --document-root - Path to document root directory @@ -198,11 +201,18 @@ ensure_web_server_app_configuration_exists() { while [[ "$#" -gt 0 ]]; do case "$1" in # Common flags + --disable \ + | --disable-http \ + | --disable-https \ + ) + apache_args+=("$1") + nginx_args+=("$1") + ;; --hosts \ + | --server-name \ + | --server-aliases \ | --type \ | --allow-remote-connections \ - | --disabled \ - | --enable-https \ | --http-port \ | --https-port \ | --document-root \ @@ -347,8 +357,13 @@ ensure_web_server_prefix_configuration_exists() { # Arguments: # $1 - App name # Flags: -# --hosts - Hosts to enable -# --enable-https - Update HTTPS app configuration +# --hosts - Host listen addresses +# --server-name - Server name +# --server-aliases - Server aliases +# --enable-http - Enable HTTP app configuration (if not enabled already) +# --enable-https - Enable HTTPS app configuration (if not enabled already) +# --disable-http - Disable HTTP app configuration (if not disabled already) +# --disable-https - Disable HTTPS app configuration (if not disabled already) # --http-port - HTTP port number # --https-port - HTTPS port number # Returns: @@ -363,8 +378,20 @@ web_server_update_app_configuration() { while [[ "$#" -gt 0 ]]; do case "$1" in # Common flags - --hosts \ + --enable-http \ | --enable-https \ + | --disable-http \ + | --disable-https \ + ) + args+=("$1") + ;; + --hosts \ + | --server-name \ + | --server-aliases \ + | --enable-http \ + | --enable-https \ + | --disable-http \ + | --disable-https \ | --http-port \ | --https-port \ ) diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index b838e1fd35ce..064dba05cfa7 100644 --- a/bitnami/spring-cloud-dataflow/README.md +++ b/bitnami/spring-cloud-dataflow/README.md @@ -39,7 +39,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/). -* [`2`, `2-debian-10`, `2.9.0`, `2.9.0-debian-10-r7`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.9.0-debian-10-r7/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.9.0`, `2.9.0-debian-10-r8`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.9.0-debian-10-r8/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow).