diff --git a/bitnami/etcd/3.4/debian-11/Dockerfile b/bitnami/etcd/3.4/debian-11/Dockerfile index 83fb377e9c88..13dcbd968dbd 100644 --- a/bitnami/etcd/3.4/debian-11/Dockerfile +++ b/bitnami/etcd/3.4/debian-11/Dockerfile @@ -2,14 +2,14 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ - org.opencontainers.image.description="Application packaged by Bitnami" \ +LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-02-17T14:32:10Z" \ + org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.4.23-debian-11-r20" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/etcd" \ + org.opencontainers.image.ref.name="3.4.24-debian-11-r0" \ org.opencontainers.image.title="etcd" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.4.23" + org.opencontainers.image.version="3.4.24" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,9 +22,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "yq-4.30.8-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \ - "etcd-3.4.23-1-linux-${OS_ARCH}-debian-11" \ + "yq-4.30.8-2-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ + "etcd-3.4.24-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -42,7 +42,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/etcd/postunpack.sh -ENV APP_VERSION="3.4.23" \ +ENV APP_VERSION="3.4.24" \ BITNAMI_APP_NAME="etcd" \ ETCDCTL_API="3" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/etcd/bin:$PATH" diff --git a/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3f2064cac9dc..b6029182a0fd 100644 --- a/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,23 +1,23 @@ { "etcd": { "arch": "amd64", - "digest": "61152d414c4e24f235a4cc5aa1c089055e4389dcde9b77e8cb55cf28de74aab1", + "digest": "34c0b9a3d60063b82d702a5ab227f2633c9d13ff814d872fd3c54733b4474594", "distro": "debian-11", "type": "NAMI", - "version": "3.4.23-1" + "version": "3.4.24-0" }, "gosu": { "arch": "amd64", - "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b", + "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-1" + "version": "1.16.0-2" }, "yq": { "arch": "amd64", - "digest": "33fec06619aa3c1f7ea3c2516bf36f79af01354972ff06998ca6fe1d65078998", + "digest": "2fcd60b9977991e83f7066cf6da2c319b21483cdc67597625af37fa753534faf", "distro": "debian-11", "type": "NAMI", - "version": "4.30.8-1" + "version": "4.30.8-2" } } \ No newline at end of file diff --git a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh index 6590eba00189..c335acb42718 100644 --- a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh +++ b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh @@ -22,6 +22,8 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" # By setting an environment variable matching *_FILE to a file path, the prefixed environment # variable will be overridden with the value specified in that file etcd_env_vars=( + ETCD_SNAPSHOTS_DIR + ETCD_SNAPSHOT_HISTORY_LIMIT ETCD_INIT_SNAPSHOTS_DIR ALLOW_NONE_AUTHENTICATION ETCD_ROOT_PASSWORD diff --git a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh index 3b8808e0e38e..02a90834e805 100755 --- a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh +++ b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh @@ -27,7 +27,7 @@ for e in "${endpoints_array[@]}"; do etcdctl snapshot save "${ETCD_SNAPSHOTS_DIR}/db-${current_time}" "${extra_flags[@]}" find "${ETCD_SNAPSHOTS_DIR}/" -maxdepth 1 -type f -name 'db-*' \! -name "db-${current_time}" \ | sort -r \ - | tail -n+$((1 + ${ETCD_SNAPSHOT_HISTORY_LIMIT})) \ + | tail -n+$((1 + ETCD_SNAPSHOT_HISTORY_LIMIT)) \ | xargs rm -f exit 0 else diff --git a/bitnami/etcd/3.4/debian-11/tags-info.yaml b/bitnami/etcd/3.4/debian-11/tags-info.yaml index bba75d5f4821..7d31cb05e5df 100644 --- a/bitnami/etcd/3.4/debian-11/tags-info.yaml +++ b/bitnami/etcd/3.4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "3.4" - 3.4-debian-11 -- 3.4.23 +- 3.4.24