Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bitnami/etcd/3.5/debian-12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ ARG TARGETARCH

LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2025-03-05T20:38:25Z" \
org.opencontainers.image.created="2025-03-11T10:12:12Z" \
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/etcd/README.md" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="3.5.19-debian-12-r0" \
org.opencontainers.image.ref.name="3.5.19-debian-12-r1" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/etcd" \
org.opencontainers.image.title="etcd" \
org.opencontainers.image.vendor="Broadcom, Inc." \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ etcd_env_vars=(
ETCD_TRUSTED_CA_FILE
ETCD_CLIENT_CERT_AUTH
ETCD_PEER_AUTO_TLS
ETCD_EXTRA_AUTH_FLAGS
)
for env_var in "${etcd_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
Expand Down Expand Up @@ -107,5 +108,6 @@ export ETCD_KEY_FILE="${ETCD_KEY_FILE:-}"
export ETCD_TRUSTED_CA_FILE="${ETCD_TRUSTED_CA_FILE:-}"
export ETCD_CLIENT_CERT_AUTH="${ETCD_CLIENT_CERT_AUTH:-false}"
export ETCD_PEER_AUTO_TLS="${ETCD_PEER_AUTO_TLS:-false}"
export ETCD_EXTRA_AUTH_FLAGS="${ETCD_EXTRA_AUTH_FLAGS:-}"

# Custom environment variables may be defined below
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ etcdctl_auth_norbac_flags() {
[[ -f "$ETCD_CERT_FILE" ]] && [[ -f "$ETCD_KEY_FILE" ]] && authFlags+=("--cert" "$ETCD_CERT_FILE" "--key" "$ETCD_KEY_FILE")
[[ -f "$ETCD_TRUSTED_CA_FILE" ]] && authFlags+=("--cacert" "$ETCD_TRUSTED_CA_FILE")
fi
if [[ -n "$ETCD_EXTRA_AUTH_FLAGS" ]]; then
read -r -a extraAuthFlags <<< "$(tr ',;' ' ' <<< "$ETCD_EXTRA_AUTH_FLAGS")"
authFlags+=("${extraAuthFlags[@]}")
fi

echo "${authFlags[*]}"
}

Expand Down
1 change: 1 addition & 0 deletions bitnami/etcd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ Apart from providing your custom configuration file, you can also modify the ser
| `ETCD_TRUSTED_CA_FILE` | Path to the client server TLS trusted CA cert file. | `nil` |
| `ETCD_CLIENT_CERT_AUTH` | Enable client cert authentication | `false` |
| `ETCD_PEER_AUTO_TLS` | Use generated certificates for TLS communications with peers. | `false` |
| `ETCD_EXTRA_AUTH_FLAGS` | Comma separated list of authentication flags to append to etcdctl | `nil` |

#### Read-only environment variables

Expand Down
Loading