From 91697506e59b18853dbe42e18f4706026fa2a5b0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 22 May 2020 02:41:08 +0000 Subject: [PATCH] 2.1.0-debian-10-r112 release --- .../tensorflow-resnet/2/debian-10/Dockerfile | 9 ++++--- .../2/debian-10/docker-compose.yml | 4 ++-- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/tensorflow-resnet/README.md | 2 +- bitnami/tensorflow-resnet/docker-compose.yml | 4 ++-- 5 files changed, 35 insertions(+), 8 deletions(-) create mode 100755 bitnami/tensorflow-resnet/2/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/tensorflow-resnet/2/debian-10/Dockerfile b/bitnami/tensorflow-resnet/2/debian-10/Dockerfile index 68e535f8ae28..c2355e59e20c 100644 --- a/bitnami/tensorflow-resnet/2/debian-10/Dockerfile +++ b/bitnami/tensorflow-resnet/2/debian-10/Dockerfile @@ -7,7 +7,7 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ 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-resnet" \ - BITNAMI_IMAGE_VERSION="2.1.0-debian-10-r111" \ - NAMI_PREFIX="/.nami" + BITNAMI_IMAGE_VERSION="2.1.0-debian-10-r112" \ + NAMI_PREFIX="/.nami" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" USER 1001 ENTRYPOINT [ "/app-entrypoint.sh" ] diff --git a/bitnami/tensorflow-resnet/2/debian-10/docker-compose.yml b/bitnami/tensorflow-resnet/2/debian-10/docker-compose.yml index be7e487ab932..eb54861050cf 100644 --- a/bitnami/tensorflow-resnet/2/debian-10/docker-compose.yml +++ b/bitnami/tensorflow-resnet/2/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: tensorflow-serving: - image: 'bitnami/tensorflow-serving:2' + image: 'docker.io/bitnami/tensorflow-serving:2-debian-10' environment: - TENSORFLOW_SERVING_MODEL_NAME=resnet ports: @@ -11,7 +11,7 @@ services: - 'tensorflow_serving_data:/bitnami' - '/tmp/model-data:/bitnami/model-data' tensorflow-resnet: - image: 'bitnami/tensorflow-resnet:2' + image: 'docker.io/bitnami/tensorflow-resnet:2-debian-10' depends_on: - tensorflow-serving volumes: diff --git a/bitnami/tensorflow-resnet/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/tensorflow-resnet/2/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/tensorflow-resnet/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-resnet/README.md b/bitnami/tensorflow-resnet/README.md index 9b7921c143a9..d12b74b07f03 100644 --- a/bitnami/tensorflow-resnet/README.md +++ b/bitnami/tensorflow-resnet/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-debian-10`, `2.1.0-debian-10-r111`, `2`, `2.1.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-resnet/blob/2.1.0-debian-10-r111/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.1.0-debian-10-r112`, `2`, `2.1.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-resnet/blob/2.1.0-debian-10-r112/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/tensorflow-resnet GitHub repo](https://github.com/bitnami/bitnami-docker-tensorflow-resnet). diff --git a/bitnami/tensorflow-resnet/docker-compose.yml b/bitnami/tensorflow-resnet/docker-compose.yml index be7e487ab932..eb54861050cf 100644 --- a/bitnami/tensorflow-resnet/docker-compose.yml +++ b/bitnami/tensorflow-resnet/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: tensorflow-serving: - image: 'bitnami/tensorflow-serving:2' + image: 'docker.io/bitnami/tensorflow-serving:2-debian-10' environment: - TENSORFLOW_SERVING_MODEL_NAME=resnet ports: @@ -11,7 +11,7 @@ services: - 'tensorflow_serving_data:/bitnami' - '/tmp/model-data:/bitnami/model-data' tensorflow-resnet: - image: 'bitnami/tensorflow-resnet:2' + image: 'docker.io/bitnami/tensorflow-resnet:2-debian-10' depends_on: - tensorflow-serving volumes: