From 900c38f2a8a7f95f9a8e777f59d6fe6004061209 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 14 May 2020 21:00:04 +0000
Subject: [PATCH] 1.0.2-debian-10-r35 release

---
 .../1/debian-10/Dockerfile                    |  4 ++--
 .../1/debian-10/docker-compose.yml            |  2 +-
 .../prebuildfs/usr/sbin/install_packages      | 24 +++++++++++++++++++
 bitnami/harbor-adapter-clair/README.md        |  2 +-
 .../harbor-adapter-clair/docker-compose.yml   |  2 +-
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100755 bitnami/harbor-adapter-clair/1/debian-10/prebuildfs/usr/sbin/install_packages

diff --git a/bitnami/harbor-adapter-clair/1/debian-10/Dockerfile b/bitnami/harbor-adapter-clair/1/debian-10/Dockerfile
index c21fc7b16a4e..ae937c358f05 100644
--- a/bitnami/harbor-adapter-clair/1/debian-10/Dockerfile
+++ b/bitnami/harbor-adapter-clair/1/debian-10/Dockerfile
@@ -8,7 +8,7 @@ ENV HOME="/" \
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl procps sudo unzip
+RUN install_packages ca-certificates curl gzip procps tar
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "harbor-adapter-clair" "1.0.2-0" --checksum ddb4f057f97625d096b4a6555dfe69152e58048dbf85448721391894a5726d76
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
 RUN apt-get update && apt-get upgrade -y && \
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get upgrade -y && \
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="harbor-adapter-clair" \
-    BITNAMI_IMAGE_VERSION="1.0.2-debian-10-r34" \
+    BITNAMI_IMAGE_VERSION="1.0.2-debian-10-r35" \
     PATH="/opt/bitnami/harbor-adapter-clair/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080
diff --git a/bitnami/harbor-adapter-clair/1/debian-10/docker-compose.yml b/bitnami/harbor-adapter-clair/1/debian-10/docker-compose.yml
index a55e00424ac8..38518e49b3e9 100644
--- a/bitnami/harbor-adapter-clair/1/debian-10/docker-compose.yml
+++ b/bitnami/harbor-adapter-clair/1/debian-10/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   harbor-adapter-clair:
-    image: bitnami/harbor-adapter-clair:1
+    image: docker.io/bitnami/harbor-adapter-clair:1-debian-10
     ports:
       - 8080:8080
     volumes:
diff --git a/bitnami/harbor-adapter-clair/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/harbor-adapter-clair/1/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/harbor-adapter-clair/1/debian-10/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+set -u
+export DEBIAN_FRONTEND=noninteractive
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    (
+      apt-get update -qq &&
+      apt-get install -y --no-install-recommends "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/harbor-adapter-clair/README.md b/bitnami/harbor-adapter-clair/README.md
index 0a0d62089fe4..c3672846538d 100644
--- a/bitnami/harbor-adapter-clair/README.md
+++ b/bitnami/harbor-adapter-clair/README.md
@@ -45,7 +45,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/).
 
 
-* [`1-debian-10`, `1.0.2-debian-10-r34`, `1`, `1.0.2`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair/blob/1.0.2-debian-10-r34/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.0.2-debian-10-r35`, `1`, `1.0.2`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair/blob/1.0.2-debian-10-r35/1/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).
 
diff --git a/bitnami/harbor-adapter-clair/docker-compose.yml b/bitnami/harbor-adapter-clair/docker-compose.yml
index a55e00424ac8..38518e49b3e9 100644
--- a/bitnami/harbor-adapter-clair/docker-compose.yml
+++ b/bitnami/harbor-adapter-clair/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   harbor-adapter-clair:
-    image: bitnami/harbor-adapter-clair:1
+    image: docker.io/bitnami/harbor-adapter-clair:1-debian-10
     ports:
       - 8080:8080
     volumes: