From 7dec81064717063c1cd72cd56adcaac8a04ebb5d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 21 May 2020 14:02:52 +0000
Subject: [PATCH] 1.6.6-debian-10-r8 release

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

diff --git a/bitnami/memcached/1/debian-10/Dockerfile b/bitnami/memcached/1/debian-10/Dockerfile
index fb88b4382a3c..d5d4dbc6bf95 100644
--- a/bitnami/memcached/1/debian-10/Dockerfile
+++ b/bitnami/memcached/1/debian-10/Dockerfile
@@ -8,7 +8,7 @@ ENV HOME="/" \
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl libc6 libevent-2.1-6 libsasl2-2 libsasl2-modules procps sasl2-bin sudo unzip
+RUN install_packages ca-certificates curl gzip libc6 libevent-2.1-6 libsasl2-2 libsasl2-modules procps sasl2-bin tar
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "memcached" "1.6.6-0" --checksum 15b1c136500b48450c07053972745188e9bfda7c8177d51e905d2a17a107e624
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c
 RUN apt-get update && apt-get upgrade -y && \
@@ -19,7 +19,7 @@ RUN ln -s /opt/bitnami/scripts/memcached/run.sh /run.sh
 COPY rootfs /
 RUN /opt/bitnami/scripts/memcached/postunpack.sh
 ENV BITNAMI_APP_NAME="memcached" \
-    BITNAMI_IMAGE_VERSION="1.6.6-debian-10-r7" \
+    BITNAMI_IMAGE_VERSION="1.6.6-debian-10-r8" \
     PATH="/opt/bitnami/memcached/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 11211
diff --git a/bitnami/memcached/1/debian-10/docker-compose.yml b/bitnami/memcached/1/debian-10/docker-compose.yml
index 5377af738cd5..7ddbd15bd5be 100644
--- a/bitnami/memcached/1/debian-10/docker-compose.yml
+++ b/bitnami/memcached/1/debian-10/docker-compose.yml
@@ -2,6 +2,6 @@ version: '2'
 
 services:
   memcached:
-    image: 'bitnami/memcached:1'
+    image: 'docker.io/bitnami/memcached:1-debian-10'
     ports:
       - '11211:11211'
diff --git a/bitnami/memcached/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/memcached/1/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/memcached/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/memcached/README.md b/bitnami/memcached/README.md
index 312424ec9938..85e7a5263714 100644
--- a/bitnami/memcached/README.md
+++ b/bitnami/memcached/README.md
@@ -44,7 +44,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.6.6-debian-10-r7`, `1`, `1.6.6`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-memcached/blob/1.6.6-debian-10-r7/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.6.6-debian-10-r8`, `1`, `1.6.6`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-memcached/blob/1.6.6-debian-10-r8/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/memcached GitHub repo](https://github.com/bitnami/bitnami-docker-memcached).
 
diff --git a/bitnami/memcached/docker-compose.yml b/bitnami/memcached/docker-compose.yml
index 5377af738cd5..7ddbd15bd5be 100644
--- a/bitnami/memcached/docker-compose.yml
+++ b/bitnami/memcached/docker-compose.yml
@@ -2,6 +2,6 @@ version: '2'
 
 services:
   memcached:
-    image: 'bitnami/memcached:1'
+    image: 'docker.io/bitnami/memcached:1-debian-10'
     ports:
       - '11211:11211'