Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-15 14:58:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.5.2-debian-10-r68 release

Browse Source
This commit is contained in:
Bitnami Bot
2022-04-13 18:54:48 +00:00
committed by Bitnami Containers
parent 23659a9d7d
commit f268f86d01
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/etcd/3.5/debian-10/Dockerfile
View File

@@ -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.5.2-0" --checksum 01cc2b4382191deee9a3eec9ad5f9fd8cf2b8afda7883ff2ffa497f58fdfb2a2
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "etcd" "3.5.2-10" --checksum 01cc2b4382191deee9a3eec9ad5f9fd8cf2b8afda7883ff2ffa497f58fdfb2a2
RUN apt-get update && apt-get upgrade -y && \
rm -r /var/lib/apt/lists /var/cache/apt/archives
RUN chmod g+rwX /opt/bitnami

2
bitnami/etcd/3.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@@ -4,7 +4,7 @@
"digest": "01cc2b4382191deee9a3eec9ad5f9fd8cf2b8afda7883ff2ffa497f58fdfb2a2",
"distro": "debian-10",
"type": "NAMI",
"version": "3.5.2-0"
"version": "3.5.2-10"
},
"gosu": {
"arch": "amd64",

13
bitnami/etcd/3.5/debian-10/rootfs/opt/bitnami/scripts/libetcd.sh
View File

@@ -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

2
bitnami/etcd/README.md
View File

@@ -48,7 +48,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/).
* [`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.5`, `3.5-debian-10`, `3.5.2`, `3.5.2-debian-10-r68` (3.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.5.2-debian-10-r68/3.5/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-r13` (3.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.3.27-debian-10-r13/3.3/debian-10/Dockerfile)