2.5.0-debian-10-r0 release

bitnami/spring-cloud-skipper/2/debian-10/Dockerfile

@@ -11,7 +11,7 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 procps tar
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.265-0" --checksum 6c85e8df954fca444f2471195524db015ec24a67e42f43579401f2adb5189cb8
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "3.3.2-0" --checksum 50cac57ffd984455e7321d1f13380f94b6bda2a16b7e2547ba33aad347d5e9eb
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-skipper" "2.4.3-0" --checksum afa299170c27c0740050c3c892917b80884f0e01820ee98702e15165f7286890
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-skipper" "2.5.0-0" --checksum e5722aa7643b2dfe322cc64e9d9b1940bafff405683f925927f4ac92e7aa47b2
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
@@ -20,7 +20,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/spring-cloud-skipper/postunpack.sh
 ENV BITNAMI_APP_NAME="spring-cloud-skipper" \
-    BITNAMI_IMAGE_VERSION="2.4.3-debian-10-r22" \
+    BITNAMI_IMAGE_VERSION="2.5.0-debian-10-r0" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 USER 1001

bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -15,10 +15,10 @@
     },
     "spring-cloud-skipper": {
         "arch": "amd64",
-        "digest": "afa299170c27c0740050c3c892917b80884f0e01820ee98702e15165f7286890",
+        "digest": "e5722aa7643b2dfe322cc64e9d9b1940bafff405683f925927f4ac92e7aa47b2",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.4.3-0"
+        "version": "2.5.0-0"
     },
     "yq": {
         "arch": "amd64",

bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh

@@ -6,6 +6,7 @@
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/libvalidations.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Functions
 
@@ -175,23 +176,42 @@ EOF
 ########################
 # Generate a logrotate configuration file
 # Arguments:
-#   $1 - Log path
-#   $2 - Period
-#   $3 - Number of rotations to store
-#   $4 - Extra options (Optional)
+#   $1 - Service name
+#   $2 - Log files pattern
+# Flags:
+#   --period - Period
+#   --rotations - Number of rotations to store
+#   --extra - Extra options (Optional)
 # Returns:
 #   None
 #########################
 generate_logrotate_conf() {
     local service_name="${1:?service name is missing}"
     local log_path="${2:?log path is missing}"
-    local period="${3:-weekly}"
-    local rotations="${4:-150}"
-    local extra_options="${5:-}"
+    local period="weekly"
+    local rotations="150"
+    local extra=""
     local logrotate_conf_dir="/etc/logrotate.d"
+    local var_name
+    # Parse optional CLI flags
+    shift 2
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            --period|--rotations|--extra)
+                var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
+                shift
+                declare "$var_name"="${1:?"$var_name" is missing}"
+                ;;
+            *)
+                echo "Invalid command line flag ${1}" >&2
+                return 1
+                ;;
+        esac
+        shift
+    done
 
     mkdir -p "$logrotate_conf_dir"
-    cat >"${logrotate_conf_dir}/${service_name}" <<EOF
+    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
 ${log_path} {
   ${period}
   rotate ${rotations}
@@ -199,7 +219,7 @@ ${log_path} {
   compress
   copytruncate
   missingok
-  ${extra_options}
+$(indent "$extra" 2)
 }
 EOF
 }

bitnami/spring-cloud-skipper/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-debian-10`, `2.4.3-debian-10-r22`, `2`, `2.4.3`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.4.3-debian-10-r22/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.5.0`, `2.5.0-debian-10-r0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.5.0-debian-10-r0/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spring-cloud-skipper GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper).