From a32b8fe0bfe2efebe704bbae1bf12c982ee2729b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 13 Apr 2022 15:37:17 +0000 Subject: [PATCH] 3.4.18-debian-10-r14 release --- bitnami/etcd/3.4/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../debian-10/rootfs/opt/bitnami/scripts/libetcd.sh | 13 ++++++++----- bitnami/etcd/README.md | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bitnami/etcd/3.4/debian-10/Dockerfile b/bitnami/etcd/3.4/debian-10/Dockerfile index a533cf33f668..de9a2f1f579d 100644 --- a/bitnami/etcd/3.4/debian-10/Dockerfile +++ b/bitnami/etcd/3.4/debian-10/Dockerfile @@ -11,7 +11,7 @@ COPY prebuildfs / RUN install_packages acl ca-certificates curl gzip procps tar RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.24.4-0" --checksum b6da9c162bd8e43de7cd0cf32ea699415d2bd1f9399ae38d8fe0a5eed1598721 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "etcd" "3.4.18-0" --checksum 2869c35bf950bba7072a23573e89883ab08aa198d8bdae76b7ae711dce142e7d +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "etcd" "3.4.18-1" --checksum 2869c35bf950bba7072a23573e89883ab08aa198d8bdae76b7ae711dce142e7d 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.4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/etcd/3.4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 7b50f630f19c..335486cef120 100644 --- a/bitnami/etcd/3.4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/etcd/3.4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -4,7 +4,7 @@ "digest": "2869c35bf950bba7072a23573e89883ab08aa198d8bdae76b7ae711dce142e7d", "distro": "debian-10", "type": "NAMI", - "version": "3.4.18-0" + "version": "3.4.18-1" }, "gosu": { "arch": "amd64", diff --git a/bitnami/etcd/3.4/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.4/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh index 7b44dda7051f..7e765f68ba02 100644 --- a/bitnami/etcd/3.4/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh +++ b/bitnami/etcd/3.4/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh @@ -307,6 +307,8 @@ etcdctl_auth_flags() { etcd_store_member_id() { local -a extra_flags + info "Obtaining cluster member ID" + etcd_start_bg read -r -a extra_flags <<<"$(etcdctl_auth_flags)" is_boolean_yes "$ETCD_ON_K8S" && extra_flags+=("--endpoints=$(etcdctl_get_endpoints)") if retry_while "etcdctl ${extra_flags[*]} member list" >/dev/null 2>&1; then @@ -317,8 +319,9 @@ etcd_store_member_id() { read -r -a advertised_array <<<"$(tr ',;' ' ' <<<"$ETCD_ADVERTISE_CLIENT_URLS")" stdbuf -oL etcdctl "${extra_flags[@]}" member list | grep -w "${advertised_array[0]}" | awk -F "," '{ print $1}' >"${ETCD_DATA_DIR}/member_id" || true done - debug "Stored member ID: $(cat "${ETCD_DATA_DIR}/member_id")" + info "Stored member ID: $(cat "${ETCD_DATA_DIR}/member_id")" fi + etcd_stop } ######################## @@ -604,7 +607,7 @@ etcd_initialize() { ) fi debug_execute etcdctl snapshot restore "${ETCD_INIT_SNAPSHOTS_DIR}/${ETCD_INIT_SNAPSHOT_FILENAME}" "${restore_args[@]}" - debug_execute etcd_store_member_id & + etcd_store_member_id else error "There was no snapshot to restore!" exit 1 @@ -620,7 +623,7 @@ etcd_initialize() { else ! is_empty_value "$ETCD_ROOT_PASSWORD" && etcd_configure_rbac fi - debug_execute etcd_store_member_id & + etcd_store_member_id fi else info "Detected data from previous deployments" @@ -645,7 +648,7 @@ etcd_initialize() { --initial-cluster "$ETCD_INITIAL_CLUSTER" \ --initial-cluster-token "$ETCD_INITIAL_CLUSTER_TOKEN" \ --initial-advertise-peer-urls "$ETCD_INITIAL_ADVERTISE_PEER_URLS" - debug_execute etcd_store_member_id & + etcd_store_member_id else error "There was no snapshot to restore!" exit 1 @@ -660,7 +663,7 @@ etcd_initialize() { extra_flags+=("--peer-urls=$ETCD_INITIAL_ADVERTISE_PEER_URLS") etcdctl member add "$ETCD_NAME" "${extra_flags[@]}" | grep "^ETCD_" >"$ETCD_NEW_MEMBERS_ENV_FILE" replace_in_file "$ETCD_NEW_MEMBERS_ENV_FILE" "^" "export " - debug_execute etcd_store_member_id & + etcd_store_member_id elif [[ -f "${ETCD_DATA_DIR}/member_id" ]]; then info "Updating member in existing cluster" export ETCD_INITIAL_CLUSTER_STATE=existing diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md index 23b82df99369..866fd5112eb4 100644 --- a/bitnami/etcd/README.md +++ b/bitnami/etcd/README.md @@ -49,7 +49,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.5`, `3.5-debian-10`, `3.5.2`, `3.5.2-debian-10-r67` (3.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.5.2-debian-10-r67/3.5/debian-10/Dockerfile) -* [`3.4`, `3.4-debian-10`, `3.4.18`, `3.4.18-debian-10-r13`, `latest` (3.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.18-debian-10-r13/3.4/debian-10/Dockerfile) +* [`3.4`, `3.4-debian-10`, `3.4.18`, `3.4.18-debian-10-r14`, `latest` (3.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.18-debian-10-r14/3.4/debian-10/Dockerfile) * [`3.3`, `3.3-debian-10`, `3.3.27`, `3.3.27-debian-10-r12` (3.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.3.27-debian-10-r12/3.3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/etcd GitHub repo](https://github.com/bitnami/bitnami-docker-etcd).