diff --git a/bitnami/schema-registry/7.2/debian-12/Dockerfile b/bitnami/schema-registry/7.2/debian-12/Dockerfile index f28f864b083d..9d321c9435d0 100644 --- a/bitnami/schema-registry/7.2/debian-12/Dockerfile +++ b/bitnami/schema-registry/7.2/debian-12/Dockerfile @@ -8,10 +8,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-11T22:04:30Z" \ + org.opencontainers.image.created="2024-02-21T00:18:30Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.9-debian-12-r5" \ + org.opencontainers.image.ref.name="7.2.9-debian-12-r6" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.2.9" @@ -27,8 +27,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl netcat-openbsd procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.10-13-1-linux-${OS_ARCH}-debian-12" \ - "schema-registry-7.2.9-1-linux-${OS_ARCH}-debian-12" \ + "java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \ + "schema-registry-7.2.9-2-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/schema-registry/7.2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 3847447f92a2..0b6a4aeb7f06 100644 --- a/bitnami/schema-registry/7.2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "17.0.10-13-1" + "version": "17.0.10-13-2" }, "schema-registry": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "7.2.9-1" + "version": "7.2.9-2" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry-env.sh b/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry-env.sh index 52891a4afa5f..18cb9211ad6f 100644 --- a/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry-env.sh +++ b/bitnami/schema-registry/7.2/debian-12/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.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh b/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh index 054b1860973f..ad8914b84a20 100755 --- a/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry/entrypoint.sh +++ b/bitnami/schema-registry/7.2/debian-12/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.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh b/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh index 058a9011b4ba..b37653294e7f 100755 --- a/bitnami/schema-registry/7.2/debian-12/rootfs/opt/bitnami/scripts/schema-registry/postunpack.sh +++ b/bitnami/schema-registry/7.2/debian-12/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