Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-19 05:27:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/etcd] Release 3.4.25-debian-11-r4 (#31520)

Browse Source 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-24 18:39:40 +02:00
committed by GitHub
parent 2a2edcbed5
commit 1f1483180e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/etcd/3.4/debian-11/Dockerfile
View File

@@ -4,10 +4,10 @@ ARG TARGETARCH
LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-23T13:11:05Z" \
org.opencontainers.image.created="2023-04-24T16:25:04Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="3.4.25-debian-11-r3" \
org.opencontainers.image.ref.name="3.4.25-debian-11-r4" \
org.opencontainers.image.title="etcd" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="3.4.25"
@@ -24,7 +24,7 @@ RUN install_packages ca-certificates curl procps
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"yq-4.33.3-0-linux-${OS_ARCH}-debian-11" \
"etcd-3.4.25-0-linux-${OS_ARCH}-debian-11" \
"etcd-3.4.25-1-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \

2
bitnami/etcd/3.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@@ -3,7 +3,7 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "3.4.25-0"
"version": "3.4.25-1"
},
"yq": {
"arch": "amd64",

16
bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
View File

@@ -443,26 +443,26 @@ is_healthy_etcd_cluster() {
export ETCD_ACTIVE_ENDPOINTS
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
if [[ -f "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" ]]; then
if [[ -f "/snapshots/.disaster_recovery" ]]; then
# Remove current node from the ones that need to recover
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$host:$port"
remove_in_file "/snapshots/.disaster_recovery" "$host:$port"
# Remove nodes that do not exist anymore from the ones that need to recover
read -r -a recovery_array <<<"$(tr '\n' ' ' <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery")"
read -r -a recovery_array <<<"$(tr '\n' ' ' <"/snapshots/.disaster_recovery")"
for r in "${recovery_array[@]}"; do
if [[ ! "${endpoints_array[*]}" =~ $r ]]; then
remove_in_file "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery" "$r"
remove_in_file "/snapshots/.disaster_recovery" "$r"
fi
done
if [[ $(wc -w <"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery") -eq 0 ]]; then
if [[ $(wc -w <"/snapshots/.disaster_recovery") -eq 0 ]]; then
debug "Last member to recover from the disaster!"
rm "${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
rm "/snapshots/.disaster_recovery"
fi
return_value=1
else
if [[ $active_endpoints -lt $(((cluster_size + 1) / 2)) ]]; then
debug "There are no enough active endpoints!"
for e in "${endpoints_array[@]}"; do
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"${ETCD_SNAPSHOTS_DIR}/.disaster_recovery"
[[ "$e" != "$host:$port" ]] && [[ "$e" != ":$port" ]] && echo "$e" >>"/snapshots/.disaster_recovery"
done
return_value=1
fi
@@ -669,7 +669,7 @@ etcd_initialize() {
if ! is_healthy_etcd_cluster; then
warn "Cluster not responding!"
if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
latest_snapshot_file="$(find "${ETCD_SNAPSHOTS_DIR}/" -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
latest_snapshot_file="$(find /snapshots/ -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"
if [[ "${latest_snapshot_file}" != "" ]]; then
info "Restoring etcd cluster from snapshot"
rm -rf "$ETCD_DATA_DIR"