From 5925c7961cbba09871ce492c959182f7afef574c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Mon, 29 Mar 2021 19:36:01 +0000
Subject: [PATCH] 2.2.0-debian-10-r18 release

---
 bitnami/harbor-adapter-clair/2/debian-10/Dockerfile       | 2 +-
 .../2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh   | 4 ++--
 .../prebuildfs/opt/bitnami/scripts/libpersistence.sh      | 8 ++++----
 bitnami/harbor-adapter-clair/README.md                    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile b/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile
index de7dba23beab..631f8d43918e 100644
--- a/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile
+++ b/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile
@@ -16,7 +16,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/harbor-adapter-clair/postunpack.sh
 ENV BITNAMI_APP_NAME="harbor-adapter-clair" \
-    BITNAMI_IMAGE_VERSION="2.2.0-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="2.2.0-debian-10-r18" \
     PATH="/opt/bitnami/harbor-adapter-clair/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080
diff --git a/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 8f37ecbd823e..ae5e2459c377 100644
--- a/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -106,9 +106,9 @@ is_file_writable() {
 relativize() {
     local -r path="${1:?missing path}"
     local -r base="${2:?missing base}"
-    pushd "$base" >/dev/null
+    pushd "$base" >/dev/null || exit
     realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
-    popd >/dev/null
+    popd >/dev/null || exit
 }
 
 ########################
diff --git a/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 452c1f4b2831..264a9291d634 100644
--- a/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -35,7 +35,7 @@ persist_app() {
         warn "No files are configured to be persisted"
         return
     fi
-    pushd "$install_dir" >/dev/null
+    pushd "$install_dir" >/dev/null || exit
     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
@@ -53,16 +53,16 @@ persist_app() {
         ensure_dir_exists "$file_to_persist_destination_folder"
         cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
         # Restore permissions
-        pushd "$persist_dir" >/dev/null
+        pushd "$persist_dir" >/dev/null || exit
         if am_i_root; then
             setfacl --restore="$tmp_file"
         else
             # When running as non-root, don't change ownership
             setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file")
         fi
-        popd >/dev/null
+        popd >/dev/null || exit
     done
-    popd >/dev/null
+    popd >/dev/null || exit
     rm -f "$tmp_file"
     # Install the persisted files into the installation directory, via symlinks
     restore_persisted_app "$@"
diff --git a/bitnami/harbor-adapter-clair/README.md b/bitnami/harbor-adapter-clair/README.md
index d9ad6a426c3f..1e349b471106 100644
--- a/bitnami/harbor-adapter-clair/README.md
+++ b/bitnami/harbor-adapter-clair/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.2.0`, `2.2.0-debian-10-r17`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair/blob/2.2.0-debian-10-r17/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.2.0`, `2.2.0-debian-10-r18`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair/blob/2.2.0-debian-10-r18/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/harbor-adapter-clair GitHub repo](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair).