From 608b7d5348f481b78bd2fe182a69aafbb9ca01cb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 22 May 2020 22:25:39 +0000
Subject: [PATCH] 2.1.0-debian-10-r110 release

---
 .../tensorflow-serving/2/debian-10/Dockerfile |  9 ++++---
 .../2/debian-10/docker-compose.yml            |  2 +-
 .../prebuildfs/usr/sbin/install_packages      | 24 +++++++++++++++++++
 bitnami/tensorflow-serving/README.md          |  2 +-
 bitnami/tensorflow-serving/docker-compose.yml |  2 +-
 5 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100755 bitnami/tensorflow-serving/2/debian-10/prebuildfs/usr/sbin/install_packages

diff --git a/bitnami/tensorflow-serving/2/debian-10/Dockerfile b/bitnami/tensorflow-serving/2/debian-10/Dockerfile
index f40d8caec94f..620a92ef0d9b 100644
--- a/bitnami/tensorflow-serving/2/debian-10/Dockerfile
+++ b/bitnami/tensorflow-serving/2/debian-10/Dockerfile
@@ -3,11 +3,11 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
     HOME="/" \
-    PATH="/opt/bitnami/common/bin:/opt/bitnami/tensorflow-serving/bin:/opt/bitnami/tensorflow-serving/bazel-bin/tensorflow_serving/model_servers:/opt/bitnami/nami/bin:$PATH"
+    PATH="/opt/bitnami/common/bin:/opt/bitnami/tensorflow-serving/bazel-bin/tensorflow_serving/model_servers:/opt/bitnami/tensorflow-serving/bin:/opt/bitnami/nami/bin:$PATH"
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl dirmngr gnupg libc6 libgcc1 libstdc++6 procps sudo unzip
+RUN install_packages ca-certificates curl dirmngr gnupg gzip libc6 libgcc1 libstdc++6 procps sudo tar
 RUN /build/bitnami-user.sh
 RUN /build/install-nami.sh
 RUN bitnami-pkg install tini-0.19.0-0 --checksum 9a8ae20be31a518f042fcec359f2cf35bfdb4e2a56f2fa8ff9ef2ecaf45da80c
@@ -19,8 +19,11 @@ RUN echo "deb http://http.us.debian.org/debian testing main non-free contrib" >>
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="tensorflow-serving" \
-    BITNAMI_IMAGE_VERSION="2.1.0-debian-10-r109" \
+    BITNAMI_IMAGE_VERSION="2.1.0-debian-10-r110" \
     NAMI_PREFIX="/.nami" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux" \
     TENSORFLOW_SERVING_ENABLE_MONITORING="no" \
     TENSORFLOW_SERVING_MODEL_NAME="resnet" \
     TENSORFLOW_SERVING_MONITORING_PATH="/monitoring/prometheus/metrics" \
diff --git a/bitnami/tensorflow-serving/2/debian-10/docker-compose.yml b/bitnami/tensorflow-serving/2/debian-10/docker-compose.yml
index d5601453057e..6ef95a55ad4f 100644
--- a/bitnami/tensorflow-serving/2/debian-10/docker-compose.yml
+++ b/bitnami/tensorflow-serving/2/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   tensorflow-serving:
-    image: 'bitnami/tensorflow-serving:2'
+    image: 'docker.io/bitnami/tensorflow-serving:2-debian-10'
     ports:
       - '8500:8500'
       - '8501:8501'
diff --git a/bitnami/tensorflow-serving/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/tensorflow-serving/2/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/tensorflow-serving/2/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/tensorflow-serving/README.md b/bitnami/tensorflow-serving/README.md
index 463bf929e40a..df22e66edec0 100644
--- a/bitnami/tensorflow-serving/README.md
+++ b/bitnami/tensorflow-serving/README.md
@@ -41,7 +41,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-debian-10`, `2.1.0-debian-10-r109`, `2`, `2.1.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/2.1.0-debian-10-r109/2/debian-10/Dockerfile)
+* [`2-debian-10`, `2.1.0-debian-10-r110`, `2`, `2.1.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/2.1.0-debian-10-r110/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tensorflow-serving GitHub repo](https://github.com/bitnami/bitnami-docker-tensorflow-serving).
 
diff --git a/bitnami/tensorflow-serving/docker-compose.yml b/bitnami/tensorflow-serving/docker-compose.yml
index d5601453057e..6ef95a55ad4f 100644
--- a/bitnami/tensorflow-serving/docker-compose.yml
+++ b/bitnami/tensorflow-serving/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   tensorflow-serving:
-    image: 'bitnami/tensorflow-serving:2'
+    image: 'docker.io/bitnami/tensorflow-serving:2-debian-10'
     ports:
       - '8500:8500'
       - '8501:8501'