From 5ef45ef0b193bf46ff82a73a107d50764816912f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 5 Jun 2020 02:26:53 +0000 Subject: [PATCH] 2.4.50-debian-10-r31 release --- bitnami/openldap/2/debian-10/Dockerfile | 6 ++--- .../openldap/2/debian-10/docker-compose.yml | 2 +- .../opt/bitnami/scripts/libcomponent.sh | 9 +++++-- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/openldap/README.md | 2 +- bitnami/openldap/docker-compose.yml | 2 +- 6 files changed, 37 insertions(+), 8 deletions(-) create mode 100755 bitnami/openldap/2/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/openldap/2/debian-10/Dockerfile b/bitnami/openldap/2/debian-10/Dockerfile index b61675e75d3a..afb40421fd22 100644 --- a/bitnami/openldap/2/debian-10/Dockerfile +++ b/bitnami/openldap/2/debian-10/Dockerfile @@ -8,7 +8,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 libdb5.3 libltdl7 libnss3-tools libodbc1 libperl5.28 libsasl2-2 libssl1.1 libwrap0 mdbtools procps sudo unzip +RUN install_packages ca-certificates curl gzip libc6 libdb5.3 libltdl7 libnss3-tools libodbc1 libperl5.28 libsasl2-2 libssl1.1 libwrap0 mdbtools procps tar RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "openldap" "2.4.50-0" --checksum d98bf0a8de65dc9aafde28349cce66cc3f88b18b62d762634e7aa2a1c61db046 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN apt-get update && apt-get upgrade -y && \ @@ -17,8 +17,8 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN /opt/bitnami/scripts/openldap/postunpack.sh ENV BITNAMI_APP_NAME="openldap" \ - BITNAMI_IMAGE_VERSION="2.4.50-debian-10-r30" \ - PATH="/opt/bitnami/openldap/bin:/opt/bitnami/common/bin:/opt/bitnami/openldap/sbin:$PATH" + BITNAMI_IMAGE_VERSION="2.4.50-debian-10-r31" \ + PATH="/opt/bitnami/openldap/bin:/opt/bitnami/openldap/sbin:/opt/bitnami/common/bin:$PATH" EXPOSE 1389 1636 diff --git a/bitnami/openldap/2/debian-10/docker-compose.yml b/bitnami/openldap/2/debian-10/docker-compose.yml index ee523247433f..2bb0e68a3d64 100644 --- a/bitnami/openldap/2/debian-10/docker-compose.yml +++ b/bitnami/openldap/2/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: openldap: - image: bitnami/openldap:2 + image: docker.io/bitnami/openldap:2-debian-10 ports: - '1389:1389' - '1636:1636' diff --git a/bitnami/openldap/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/openldap/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh index 025288664f69..76083e1e0a1d 100644 --- a/bitnami/openldap/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ b/bitnami/openldap/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh @@ -25,7 +25,8 @@ component_unpack() { local version="${2:?version is required}" local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" local package_sha256="" - + local directory="/opt/bitnami" + # Validate arguments shift 2 while [ "$#" -gt 0 ]; do @@ -59,6 +60,10 @@ component_unpack() { echo "Verifying package integrity" echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - fi - tar --directory /opt/bitnami --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/" + tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/" rm "${base_name}.tar.gz" + + # Include metadata about the package + touch "${directory}/.bitnami_packages" + echo "$base_name" >> "${directory}/.bitnami_packages" } diff --git a/bitnami/openldap/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/openldap/2/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/openldap/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/openldap/README.md b/bitnami/openldap/README.md index ecfe65d2748a..9fc2643ca405 100644 --- a/bitnami/openldap/README.md +++ b/bitnami/openldap/README.md @@ -35,7 +35,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.4.50-debian-10-r30`, `2`, `2.4.50`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-openldap/blob/2.4.50-debian-10-r30/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.4.50-debian-10-r31`, `2`, `2.4.50`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-openldap/blob/2.4.50-debian-10-r31/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/openldap GitHub repo](https://github.com/bitnami/bitnami-docker-openldap). diff --git a/bitnami/openldap/docker-compose.yml b/bitnami/openldap/docker-compose.yml index ee523247433f..2bb0e68a3d64 100644 --- a/bitnami/openldap/docker-compose.yml +++ b/bitnami/openldap/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: openldap: - image: bitnami/openldap:2 + image: docker.io/bitnami/openldap:2-debian-10 ports: - '1389:1389' - '1636:1636'