diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile index c2b59a24162c..c8782bea7003 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile @@ -18,7 +18,7 @@ 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-r1" \ + BITNAMI_IMAGE_VERSION="2.1.3-debian-10-r2" \ 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/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh index 212209608abc..baa038fb66fa 100755 --- a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh +++ b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh @@ -13,12 +13,12 @@ set -o pipefail . /opt/bitnami/scripts/libharbor.sh read -r -a directories <<<"$(get_system_cert_paths)" -directories+=("${SCANNER_TRIVY_CACHE_DIR}" "${SCANNER_TRIVY_REPORTS_DIR}") +directories+=("$SCANNER_TRIVY_CACHE_DIR" "$SCANNER_TRIVY_REPORTS_DIR") # Create directories for dir in "${directories[@]}"; do - ensure_dir_exists "${dir}" - chmod -R g+rwX "${dir}" + ensure_dir_exists "$dir" + chmod -R g+rwX "$dir" done # Fix for CentOS Internal TLS diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/run.sh b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/run.sh index d433bfeb5a7b..de716820b621 100755 --- a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/run.sh +++ b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/run.sh @@ -16,7 +16,7 @@ cmd=$(command -v scanner-trivy) info "** Starting Harbor Adapter Trivy **" if am_i_root; then - exec gosu "$SCANNER_TRIVY_DAEMON_USER" "${cmd}" "$@" + exec gosu "$SCANNER_TRIVY_DAEMON_USER" "$cmd" "$@" else - exec "${cmd}" "$@" + exec "$cmd" "$@" fi diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/setup.sh b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/setup.sh index 8b9ca76c65f5..36598797bf5f 100755 --- a/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/setup.sh +++ b/bitnami/harbor-adapter-trivy/2/debian-10/rootfs/opt/bitnami/scripts/harbor-adapter-trivy/setup.sh @@ -14,8 +14,8 @@ set -o pipefail . /opt/bitnami/scripts/libharbor.sh # Create directories -for dir in "${SCANNER_TRIVY_CACHE_DIR}" "${SCANNER_TRIVY_REPORTS_DIR}"; do - ensure_dir_exists "${dir}" +for dir in "$SCANNER_TRIVY_CACHE_DIR" "$SCANNER_TRIVY_REPORTS_DIR"; do + ensure_dir_exists "$dir" if am_i_root; then chown -R "${SCANNER_TRIVY_DAEMON_USER}:${SCANNER_TRIVY_DAEMON_GROUP}" "$dir" fi diff --git a/bitnami/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index f59e20a4d1d4..3df9b30d0d18 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-r1`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy/blob/2.1.3-debian-10-r1/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.1.3`, `2.1.3-debian-10-r2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy/blob/2.1.3-debian-10-r2/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).