From 5e37c1248563b1ab5c1edf47f6d1cd3ffc49c352 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 7 Sep 2022 10:26:01 +0200 Subject: [PATCH] [bitnami/etcd] Release 3.3.27-debian-11-r34 (#5408) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/etcd/3.3/debian-11/Dockerfile | 46 +++++++++++-------- .../rootfs/opt/bitnami/scripts/libetcd.sh | 2 +- bitnami/etcd/README.md | 2 +- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/bitnami/etcd/3.3/debian-11/Dockerfile b/bitnami/etcd/3.3/debian-11/Dockerfile index d571a56d20b0..a59d924dd78a 100644 --- a/bitnami/etcd/3.3/debian-11/Dockerfile +++ b/bitnami/etcd/3.3/debian-11/Dockerfile @@ -1,42 +1,48 @@ FROM docker.io/bitnami/minideb:bullseye -ENV HOME="/" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" + +ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="3.3.27-debian-11-r33" \ + org.opencontainers.image.ref.name="3.3.27-debian-11-r34" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/etcd" \ org.opencontainers.image.title="etcd" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.3.27" +ENV HOME="/" \ + OS_ARCH="${TARGETARCH:-amd64}" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip procps tar RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f yq-4.27.3-0-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.3-0-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f yq-4.27.3-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.3-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.3-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "1aa32d853f4ba273642dc4bb9fb50146434f2c44978d02e1728f72a047e50567 yq-4.27.3-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf yq-4.27.3-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf yq-4.27.3-0-linux-amd64-debian-11.tar.gz + sha256sum -c yq-4.27.3-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf yq-4.27.3-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf yq-4.27.3-0-linux-${OS_ARCH}-debian-11.tar.gz RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz + sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f etcd-3.3.27-154-linux-amd64-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/etcd-3.3.27-154-linux-amd64-debian-11.tar.gz -O ; \ + if [ ! -f etcd-3.3.27-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/etcd-3.3.27-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/etcd-3.3.27-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - echo "6c4ccbe59fa69f871756444085144fcebe053f2d4ad6a46742637f0b0c2e66e4 etcd-3.3.27-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf etcd-3.3.27-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf etcd-3.3.27-154-linux-amd64-debian-11.tar.gz + sha256sum -c etcd-3.3.27-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf etcd-3.3.27-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf etcd-3.3.27-154-linux-${OS_ARCH}-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/etcd/3.3/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.3/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh index 66bfe951f7e0..20718e4ea936 100644 --- a/bitnami/etcd/3.3/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh +++ b/bitnami/etcd/3.3/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh @@ -392,7 +392,7 @@ is_new_etcd_cluster() { } ######################## -# Setup ETCD_ACTIVE_ENDPOINTS environment variable, will return the number of active endpoints, cluster size (including not active member) and the ETCD_ACTIVE_ENDPOINTS (which is also export) +# Setup ETCD_ACTIVE_ENDPOINTS environment variable, will return the number of active endpoints , cluster size (including not active member) and the ETCD_ACTIVE_ENDPOINTS (which is also export) # Globals: # ETCD_* # Arguments: diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md index 05d6128d108d..01c254592795 100644 --- a/bitnami/etcd/README.md +++ b/bitnami/etcd/README.md @@ -47,7 +47,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.5`, `3.5-debian-11`, `3.5.4`, `3.5.4-debian-11-r32`, `latest` (3.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.5/debian-11/Dockerfile) * [`3.4`, `3.4-debian-11`, `3.4.20`, `3.4.20-debian-11-r9` (3.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.4/debian-11/Dockerfile) -* [`3.3`, `3.3-debian-11`, `3.3.27`, `3.3.27-debian-11-r33` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.3/debian-11/Dockerfile) +* [`3.3`, `3.3-debian-11`, `3.3.27`, `3.3.27-debian-11-r34` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.3/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).