public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[bitnami/consul] Release 1.17.3-debian-12-r4 (#63303) 

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2024-02-22 11:06:10 +01:00 committed by GitHub
parent e7b9ce62b5
commit 375ab616e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/consul/1/debian-12/Dockerfile
View File

@ -7,10 +7,10 @@ ARG TARGETARCH
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2024-02-21T11:29:48Z" \
org.opencontainers.image.created="2024-02-22T09:29:26Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="1.17.3-debian-12-r3" \
org.opencontainers.image.ref.name="1.17.3-debian-12-r4" \
org.opencontainers.image.title="consul" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="1.17.3"

1
bitnami/consul/1/debian-12/rootfs/opt/bitnami/scripts/consul-env.sh
View File

@ -68,6 +68,7 @@ unset consul_env_vars
export PATH="${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
export CONSUL_BASE_DIR="${BITNAMI_ROOT_DIR}/consul"
export CONSUL_CONF_DIR="${CONSUL_BASE_DIR}/conf"
export CONSUL_DEFAULT_CONF_DIR="${CONSUL_BASE_DIR}/conf.default"
export CONSUL_BIN_DIR="${CONSUL_BASE_DIR}/bin"
export CONSUL_CONF_FILE="${CONSUL_CONF_DIR}/consul.json"
export CONSUL_ENCRYPT_FILE="${CONSUL_CONF_DIR}/encrypt.json"

9
bitnami/consul/1/debian-12/rootfs/opt/bitnami/scripts/consul/entrypoint.sh
View File

@ -12,12 +12,21 @@ set -o pipefail
. /opt/bitnami/scripts/libbitnami.sh
. /opt/bitnami/scripts/libconsul.sh
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libfs.sh
# Load Consul env. variables
. /opt/bitnami/scripts/consul-env.sh
print_welcome_page
if ! is_dir_empty "$CONSUL_DEFAULT_CONF_DIR"; then
# We add the copy from default config in the entrypoint to not break users
# bypassing the setup.sh logic. If the file already exists do not overwrite (in
# case someone mounts a configuration file in /opt/bitnami/consul/conf)
debug "Copying files from $CONSUL_DEFAULT_CONF_DIR to $CONSUL_CONF_DIR"
cp -nr "$CONSUL_DEFAULT_CONF_DIR"/. "$CONSUL_CONF_DIR"
fi
if [[ "$*" = "/opt/bitnami/scripts/consul/run.sh" ]]; then
info "** Starting Consul setup **"
/opt/bitnami/scripts/consul/setup.sh

8
bitnami/consul/1/debian-12/rootfs/opt/bitnami/scripts/consul/postunpack.sh
View File

@ -12,7 +12,13 @@
# Load Consul env. variables
. /opt/bitnami/scripts/consul-env.sh
for dir in ${CONSUL_CONF_DIR} ${CONSUL_DATA_DIR} ${CONSUL_LOG_DIR} ${CONSUL_TMP_DIR} ${CONSUL_SSL_DIR} ${CONSUL_EXTRA_DIR}; do
for dir in ${CONSUL_CONF_DIR} ${CONSUL_DEFAULT_CONF_DIR} ${CONSUL_DATA_DIR} ${CONSUL_LOG_DIR} ${CONSUL_TMP_DIR} ${CONSUL_SSL_DIR} ${CONSUL_EXTRA_DIR}; do
ensure_dir_exists "${dir}"
chmod -R g+rwX "${dir}"
done
if ! is_dir_empty "$CONSUL_CONF_DIR"; then
# Copy all initially generated configuration files to the default directory
# (this is to avoid breaking when entrypoint is being overridden)
cp -r "${CONSUL_CONF_DIR}/"* "$CONSUL_DEFAULT_CONF_DIR"
fi

1
bitnami/consul/README.md
View File

@ -305,6 +305,7 @@ volumes:
|--------------------------------|---------------------------------------------|--------------------------------------------|
| `CONSUL_BASE_DIR` | Consul installation directory. | `${BITNAMI_ROOT_DIR}/consul` |
| `CONSUL_CONF_DIR` | Consul configuration directory. | `${CONSUL_BASE_DIR}/conf` |
| `CONSUL_DEFAULT_CONF_DIR` | Consul default configuration directory. | `${CONSUL_BASE_DIR}/conf.default` |
| `CONSUL_BIN_DIR` | Consul binary directory. | `${CONSUL_BASE_DIR}/bin` |
| `CONSUL_CONF_FILE` | Consul configuration file. | `${CONSUL_CONF_DIR}/consul.json` |
| `CONSUL_ENCRYPT_FILE` | Consul encrytion configuration file. | `${CONSUL_CONF_DIR}/encrypt.json` |