diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile index 3c85a376e954..91de201a85da 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile @@ -9,14 +9,14 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 procps rpm tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-adapter-trivy" "2.1.3-2" --checksum 89b71104a30af9fcae1b2969f0af1f3dde149c76b8da2446aee0a218b639174e +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-adapter-trivy" "2.1.3-3" --checksum af6af3f92b7a8098a9854360314ae1bc22e492666d33da8db429d777ece6045b RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh ENV BITNAMI_APP_NAME="harbor-adapter-trivy" \ - BITNAMI_IMAGE_VERSION="2.1.3-debian-10-r31" \ + BITNAMI_IMAGE_VERSION="2.1.3-debian-10-r32" \ PATH="/opt/bitnami/harbor-adapter-trivy/bin:/opt/bitnami/common/bin:$PATH" WORKDIR /opt/bitnami/harbor-adapter-trivy diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index bcbb46faf6cf..fc930c465dc0 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,9 +8,9 @@ }, "harbor-adapter-trivy": { "arch": "amd64", - "digest": "89b71104a30af9fcae1b2969f0af1f3dde149c76b8da2446aee0a218b639174e", + "digest": "af6af3f92b7a8098a9854360314ae1bc22e492666d33da8db429d777ece6045b", "distro": "debian-10", "type": "NAMI", - "version": "2.1.3-2" + "version": "2.1.3-3" } } \ No newline at end of file diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy-env.sh b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy-env.sh index 427b16a28461..df15cab5c5f7 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy-env.sh +++ b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy-env.sh @@ -8,6 +8,9 @@ # 3. Environment variables overridden via external files using *_FILE variables (see below) # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) +# Load logging library +. /opt/bitnami/scripts/liblog.sh + export BITNAMI_ROOT_DIR="/opt/bitnami" export BITNAMI_VOLUME_DIR="/bitnami" @@ -25,8 +28,12 @@ harbor_adapter_trivy_env_vars=( for env_var in "${harbor_adapter_trivy_env_vars[@]}"; do file_env_var="${env_var}_FILE" if [[ -n "${!file_env_var:-}" ]]; then - export "${env_var}=$(< "${!file_env_var}")" - unset "${file_env_var}" + if [[ -r "${!file_env_var:-}" ]]; then + export "${env_var}=$(< "${!file_env_var}")" + unset "${file_env_var}" + else + warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable." + fi fi done unset harbor_adapter_trivy_env_vars diff --git a/bitnami/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index 16102be1d53b..87017421080e 100644 --- a/bitnami/harbor-adapter-trivy/README.md +++ b/bitnami/harbor-adapter-trivy/README.md @@ -42,7 +42,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.1.3`, `2.1.3-debian-10-r31`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy/blob/2.1.3-debian-10-r31/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.1.3`, `2.1.3-debian-10-r32`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy/blob/2.1.3-debian-10-r32/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/harbor-adapter-trivy GitHub repo](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy).