2.4.2-debian-10-r5 release

This commit is contained in:
Bitnami Bot
2020-06-30 06:41:38 +00:00
parent 046f1b43be
commit b02afdeb18
5 changed files with 11 additions and 6 deletions

View File

@@ -19,7 +19,7 @@ RUN apt-get update && apt-get upgrade -y && \
COPY rootfs /
RUN /opt/bitnami/scripts/spring-cloud-skipper/postunpack.sh
ENV BITNAMI_APP_NAME="spring-cloud-skipper" \
BITNAMI_IMAGE_VERSION="2.4.2-debian-10-r4" \
BITNAMI_IMAGE_VERSION="2.4.2-debian-10-r5" \
PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
USER 1001

View File

@@ -106,7 +106,7 @@ is_file_writable() {
relativize() {
local -r path="${1:?missing path}"
local -r base="${2:?missing base}"
pushd / >/dev/null
pushd "$base" >/dev/null
realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
popd >/dev/null
}

View File

@@ -39,6 +39,10 @@ persist_app() {
local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
local -r tmp_file="/tmp/perms.acl"
for file_to_persist in "${files_to_persist[@]}"; do
if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then
error "Cannot persist '${file_to_persist}' because it does not exist"
return 1
fi
file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"

View File

@@ -23,6 +23,7 @@ spring_cloud_skipper_env_vars=(
SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API
SPRING_CLOUD_KUBERNETES_CONFIG_NAME
SPRING_CLOUD_KUBERNETES_SECRETS_PATHS
JAVA_OPTS
)
for env_var in "${spring_cloud_skipper_env_vars[@]}"; do
@@ -45,9 +46,6 @@ export SPRING_CLOUD_SKIPPER_M2_DIR="/.m2"
export SPRING_CLOUD_SKIPPER_DAEMON_USER="dataflow"
export SPRING_CLOUD_SKIPPER_DAEMON_GROUP="dataflow"
# Java settings
export JAVA_OPTS="${JAVA_OPTS:-}"
# Dataflow settings
export SERVER_PORT="${SERVER_PORT:-}"
export SPRING_CLOUD_CONFIG_ENABLED="${SPRING_CLOUD_CONFIG_ENABLED:-false}"
@@ -55,4 +53,7 @@ export SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API="${SPRING_CLOUD_KUBERNETES_SEC
export SPRING_CLOUD_KUBERNETES_CONFIG_NAME="${SPRING_CLOUD_KUBERNETES_CONFIG_NAME:-}"
export SPRING_CLOUD_KUBERNETES_SECRETS_PATHS="${SPRING_CLOUD_KUBERNETES_SECRETS_PATHS:-}"
# Java settings
export JAVA_OPTS="${JAVA_OPTS:-}"
# Custom environment variables may be defined below