feat: Added entrypoint for tools to perform initialization.

Author: jamesiarmes

Dockerfile.tools

@@ -2,13 +2,21 @@ FROM senzing/senzingsdk-tools:4.0.0
 
 USER root
 
+# Add the PostgreSQL APT repository.
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+
 # Update packages and install additional dependencies.
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install --no-install-recommends -y awscli pipx && \
+    apt-get install --no-install-recommends -y awscli pipx postgresql-client senzingsdk-poc && \
     apt-get autoremove \
     && apt-get clean
 
+# Copy entrypoint scripts.
+COPY docker/entrypoint.sh /entrypoint.sh
+COPY docker/entrypoint.d /entrypoint.d
+
 # Add a new user and switch to it.
 RUN useradd -m -u 1001 senzing
 USER senzing
@@ -17,4 +25,8 @@ USER senzing
 ENV PATH="$PATH:/home/senzing/.local/bin"
 RUN pipx install awscli-local
 
+# Define volumes necessary to support a read-only root filesystem.
+VOLUME ["/home/senzing", "/var/lib/amazon", "/var/log"]
+
 WORKDIR /home/senzing
+ENTRYPOINT ["/entrypoint.sh"]

docker-compose.yaml

@@ -1,30 +1,28 @@
 services:
   db:
-    image: bitnami/postgresql:17.6.0
+    image: postgres:17.6
     environment:
-      # See https://github.com/bitnami/bitnami-docker-postgresql#configuration
-      POSTGRESQL_DATABASE: ${POSTGRES_DB:-G2}
-      POSTGRESQL_PASSWORD: ${POSTGRES_PASSWORD:-senzing}
-      POSTGRESQL_POSTGRES_PASSWORD: ${POSTGRESQL_POSTGRES_PASSWORD:-postgres}
-      POSTGRESQL_USERNAME: ${POSTGRES_USERNAME:-senzing}
+      # See https://hub.docker.com/_/postgres
+#      POSTGRES_DB: ${POSTGRES_DB:-G2}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-senzing}
+      POSTGRES_USER: ${POSTGRES_USERNAME:-senzing}
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USERNAME:-senzing}" ]
       interval: 10s
       timeout: 5s
       retries: 5
     ports:
       - 5432:5432
-    user: "${SENZING_UID:-504}:0"
     restart: always
     volumes:
-      - postgres:/bitnami/postgresql
+      - postgres:/var/lib/postgresql/data
 
   init-db:
     image: senzing/init-database:latest
     depends_on:
       - db
     environment:
-      SENZING_TOOLS_DATASOURCES: PEOPLE, CUSTOMERS
+      SENZING_TOOLS_DATASOURCES: PEOPLE CUSTOMERS
       SENZING_TOOLS_ENGINE_CONFIGURATION_JSON: >-
         {
           "PIPELINE": {
@@ -61,6 +59,10 @@ services:
       - db
     environment:
       AWS_ENDPOINT_URL: http://localstack:4566
+      PGHOST: db
+      PGUSER: ${POSTGRES_USERNAME:-senzing}
+      PGPASSWORD: ${POSTGRES_PASSWORD:-senzing}
+      SENZING_DATASOURCES: PEOPLE CUSTOMERS
       SENZING_ENGINE_CONFIGURATION_JSON: >-
         {
           "PIPELINE": {

docker/entrypoint.d/database-init.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if psql -lqt | cut -d \| -f 1 | grep -qw G2; then
+    echo "Database has already been initialized"
+else
+    echo "Initializing Senzing database"
+    createdb G2
+    psql -d G2 -f /opt/senzing/er/resources/schema/szcore-schema-postgresql-create.sql
+fi

docker/entrypoint.d/datasource-init.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [[ -n "${SENZING_DATASOURCES}" ]]; then
+  echo "Creating data sources"
+  > /home/senzing/data-sources.txt
+
+  IFS=" " read -r -a data_sources <<< "$SENZING_DATASOURCES"
+  for ds in "${data_sources[@]}"; do
+    echo "addDataSource ${ds}" >> /home/senzing/data-sources.txt
+  done
+
+  echo "save" >> /home/senzing/data-sources.txt
+  sz_configtool -f /home/senzing/data-sources.txt
+  rm /home/senzing/data-sources.txt
+fi

docker/entrypoint.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Execute scripts in /entrypoint.d/
+for f in /entrypoint.d/*; do
+    case "$f" in
+        *.sh)     echo "$0: running $f"; . "$f" ;;
+        *)        echo "$0: ignoring $f" ;;
+    esac
+    echo
+done
+
+# Execute the main command passed to the script.
+echo "Running as user: $(whoami)"
+echo "Executing command: $@"
+exec "$@"