From 75571c02fa6ab02a1030b145cfa255393fec83c3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 19 Feb 2024 14:54:25 +0100 Subject: [PATCH] [bitnami/flink] Release 1.18.1-debian-11-r23 (#62093) Signed-off-by: Bitnami Containers --- bitnami/flink/1/debian-11/Dockerfile | 4 ++-- .../1/debian-11/rootfs/opt/bitnami/scripts/flink-env.sh | 1 + .../rootfs/opt/bitnami/scripts/flink/entrypoint.sh | 6 ++++++ .../rootfs/opt/bitnami/scripts/flink/postunpack.sh | 5 +++++ bitnami/flink/README.md | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bitnami/flink/1/debian-11/Dockerfile b/bitnami/flink/1/debian-11/Dockerfile index aed4a5a6548f..38cd685dc26d 100644 --- a/bitnami/flink/1/debian-11/Dockerfile +++ b/bitnami/flink/1/debian-11/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-02-16T08:22:54Z" \ + org.opencontainers.image.created="2024-02-19T12:35:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.18.1-debian-11-r22" \ + org.opencontainers.image.ref.name="1.18.1-debian-11-r23" \ org.opencontainers.image.title="flink" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.18.1" diff --git a/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink-env.sh b/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink-env.sh index 7d9c941f2012..483acefa7aff 100644 --- a/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink-env.sh +++ b/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink-env.sh @@ -48,6 +48,7 @@ export FLINK_BIN_DIR="${FLINK_BASE_DIR}/bin" export FLINK_WORK_DIR="${FLINK_BASE_DIR}" export FLINK_LOG_DIR="${FLINK_BASE_DIR}/log" export FLINK_CONF_DIR="${FLINK_BASE_DIR}/conf" +export FLINK_DEFAULT_CONF_DIR="${FLINK_BASE_DIR}/conf.default" export FLINK_CONF_FILE="flink-conf.yaml" export FLINK_CONF_FILE_PATH="${FLINK_CONF_DIR}/${FLINK_CONF_FILE}" export FLINK_MODE="${FLINK_MODE:-jobmanager}" diff --git a/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/entrypoint.sh b/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/entrypoint.sh index 12cd5f81ebc5..571db759c2c6 100755 --- a/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/entrypoint.sh +++ b/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/entrypoint.sh @@ -18,6 +18,12 @@ set -o pipefail print_welcome_page +# 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/flink/conf) +debug "Copying files from $FLINK_DEFAULT_CONF_DIR to $FLINK_CONF_DIR" +cp -nfr "$FLINK_DEFAULT_CONF_DIR"/. "$FLINK_CONF_DIR" + if [[ "$1" = "/opt/bitnami/scripts/flink/run.sh" ]]; then info "** Starting Apache Flink ${FLINK_MODE} setup **" /opt/bitnami/scripts/flink/setup.sh diff --git a/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/postunpack.sh b/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/postunpack.sh index 72c6ff9e4cd0..2c9d139286a6 100755 --- a/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/postunpack.sh +++ b/bitnami/flink/1/debian-11/rootfs/opt/bitnami/scripts/flink/postunpack.sh @@ -21,6 +21,7 @@ set -o pipefail dirs=( "${FLINK_WORK_DIR}" "${FLINK_CONF_DIR}" + "${FLINK_DEFAULT_CONF_DIR}" "${FLINK_VOLUME_DIR}" ) @@ -35,3 +36,7 @@ done # Set up execution permissions for /bin folder ensure_dir_exists "${FLINK_WORK_DIR}/bin" configure_permissions_ownership "${FLINK_WORK_DIR}/bin" -d "775" -f "775" + +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "${FLINK_CONF_DIR}/"* "$FLINK_DEFAULT_CONF_DIR" \ No newline at end of file diff --git a/bitnami/flink/README.md b/bitnami/flink/README.md index 202adeddb81e..e48ae1dff5bc 100644 --- a/bitnami/flink/README.md +++ b/bitnami/flink/README.md @@ -82,6 +82,7 @@ Non-root container images add an extra layer of security and are generally recom | `FLINK_WORK_DIR` | Flink installation directory. | `${FLINK_BASE_DIR}` | | `FLINK_LOG_DIR` | Flink log directory. | `${FLINK_BASE_DIR}/log` | | `FLINK_CONF_DIR` | Flink configuration directory. | `${FLINK_BASE_DIR}/conf` | +| `FLINK_DEFAULT_CONF_DIR` | Flink configuration directory. | `${FLINK_BASE_DIR}/conf.default` | | `FLINK_CONF_FILE` | Flink configuration file name. | `flink-conf.yaml` | | `FLINK_CONF_FILE_PATH` | Flink configuration file path. | `${FLINK_CONF_DIR}/${FLINK_CONF_FILE}` | | `FLINK_VOLUME_DIR` | Flink directory for mounted configuration files. | `${BITNAMI_VOLUME_DIR}/flink` |