From ad343de5c119cdae2c04ddfaba274d08d27b5a5e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 19 Feb 2024 14:43:54 +0100 Subject: [PATCH] [bitnami/schema-registry] Release 7.5.3-debian-11-r17 (#62092) Signed-off-by: Bitnami Containers --- bitnami/schema-registry/7.5/debian-11/Dockerfile | 4 ++-- .../rootfs/opt/bitnami/scripts/schema-registry-env.sh | 1 + .../opt/bitnami/scripts/schema-registry/entrypoint.sh | 6 ++++++ .../opt/bitnami/scripts/schema-registry/postunpack.sh | 6 +++++- bitnami/schema-registry/README.md | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bitnami/schema-registry/7.5/debian-11/Dockerfile b/bitnami/schema-registry/7.5/debian-11/Dockerfile index 778d86dd5094..57af2f7ec004 100644 --- a/bitnami/schema-registry/7.5/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.5/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-16T15:07:45Z" \ + org.opencontainers.image.created="2024-02-19T12:30:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.5.3-debian-11-r16" \ + org.opencontainers.image.ref.name="7.5.3-debian-11-r17" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.5.3" diff --git a/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry-env.sh b/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry-env.sh index 52891a4afa5f..18cb9211ad6f 100644 --- a/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry-env.sh +++ b/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry-env.sh @@ -60,6 +60,7 @@ export SCHEMA_REGISTRY_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/schema-registry" export SCHEMA_REGISTRY_BIN_DIR="${SCHEMA_REGISTRY_BASE_DIR}/bin" export SCHEMA_REGISTRY_CERTS_DIR="${SCHEMA_REGISTRY_BASE_DIR}/certs" export SCHEMA_REGISTRY_CONF_DIR="${SCHEMA_REGISTRY_BASE_DIR}/etc" +export SCHEMA_REGISTRY_DEFAULT_CONF_DIR="${SCHEMA_REGISTRY_BASE_DIR}/etc.default" export SCHEMA_REGISTRY_LOGS_DIR="${SCHEMA_REGISTRY_BASE_DIR}/logs" export SCHEMA_REGISTRY_CONF_FILE="${SCHEMA_REGISTRY_CONF_DIR}/schema-registry/schema-registry.properties" export SCHEMA_REGISTRY_MOUNTED_CONF_DIR="${SCHEMA_REGISTRY_MOUNTED_CONF_DIR:-${SCHEMA_REGISTRY_VOLUME_DIR}/etc}" diff --git a/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh b/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh index 054b1860973f..ad8914b84a20 100755 --- a/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh +++ b/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh @@ -19,6 +19,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/schema-registry/etc) +debug "Copying files from $SCHEMA_REGISTRY_DEFAULT_CONF_DIR to $SCHEMA_REGISTRY_CONF_DIR" +cp -nr "$SCHEMA_REGISTRY_DEFAULT_CONF_DIR"/. "$SCHEMA_REGISTRY_CONF_DIR" + if [[ "$1" = "/opt/bitnami/scripts/schema-registry/run.sh" ]]; then info "** Starting Schema Registry setup **" /opt/bitnami/scripts/schema-registry/setup.sh diff --git a/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh b/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh index 058a9011b4ba..b37653294e7f 100755 --- a/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh +++ b/bitnami/schema-registry/7.5/debian-11/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh @@ -92,7 +92,11 @@ EOF rm "$SCHEMA_REGISTRY_CONF_FILE" schema_registry_create_default_configuration # Ensure directories used by Schema Registry exist and have proper ownership and permissions -for dir in "$SCHEMA_REGISTRY_CONF_DIR" "$SCHEMA_REGISTRY_LOGS_DIR" "$SCHEMA_REGISTRY_CERTS_DIR"; do +for dir in "$SCHEMA_REGISTRY_CONF_DIR" "$SCHEMA_REGISTRY_DEFAULT_CONF_DIR" "$SCHEMA_REGISTRY_LOGS_DIR" "$SCHEMA_REGISTRY_CERTS_DIR"; do ensure_dir_exists "$dir" chmod -R g+rwX "$dir" done + +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "${SCHEMA_REGISTRY_CONF_DIR}/"* "$SCHEMA_REGISTRY_DEFAULT_CONF_DIR" \ No newline at end of file diff --git a/bitnami/schema-registry/README.md b/bitnami/schema-registry/README.md index 3e23bb87e8e5..668bdae85c15 100644 --- a/bitnami/schema-registry/README.md +++ b/bitnami/schema-registry/README.md @@ -73,6 +73,7 @@ docker build -t bitnami/APP:latest . | `SCHEMA_REGISTRY_BIN_DIR` | SCHEMA REGISTRY certificates directory. | `${SCHEMA_REGISTRY_BASE_DIR}/bin` | | `SCHEMA_REGISTRY_CERTS_DIR` | SCHEMA REGISTRY certificates directory. | `${SCHEMA_REGISTRY_BASE_DIR}/certs` | | `SCHEMA_REGISTRY_CONF_DIR` | SCHEMA REGISTRY configuration directory. | `${SCHEMA_REGISTRY_BASE_DIR}/etc` | +| `SCHEMA_REGISTRY_DEFAULT_CONF_DIR` | SCHEMA REGISTRY configuration directory. | `${SCHEMA_REGISTRY_BASE_DIR}/etc.default` | | `SCHEMA_REGISTRY_LOGS_DIR` | SCHEMA REGISTRY logs directory. | `${SCHEMA_REGISTRY_BASE_DIR}/logs` | | `SCHEMA_REGISTRY_CONF_FILE` | Main SCHEMA REGISTRY configuration file. | `${SCHEMA_REGISTRY_CONF_DIR}/schema-registry/schema-registry.properties` | | `SCHEMA_REGISTRY_DAEMON_USER` | Users that will execute the SCHEMA REGISTRY Server process. | `schema-registry` |