init-muiltidb.sql.template fixes

Author: luismr

Dockerfile

@@ -14,13 +14,14 @@ ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-pguserstrongpassword}
 ENV POSTGRES_DB=${POSTGRES_DB:-postgres} 
 ENV POSTGRES_DB_SIDECARS=${POSTGRES_DB_SIDECARS}
 
-COPY init-multidb.sh /docker-entrypoint-initdb.d/init-multidb.sh
-RUN chmod +x /docker-entrypoint-initdb.d/init-multidb.sh
-
 RUN apt-get update && \
     apt-get install -y build-essential postgresql-server-dev-17 git gettext && \
     git clone --branch v0.7.1 https://github.com/pgvector/pgvector.git && \
     cd pgvector && \
     make && \
     make install
 
+COPY init-multidb.sh /docker-entrypoint-initdb.d/init-multidb.sh
+COPY init-multidb.sql.template /docker-entrypoint-initdb.d/init-multidb.sql.template
+RUN chmod +x /docker-entrypoint-initdb.d/init-multidb.sh
+

init-multidb.sh

@@ -9,35 +9,25 @@ function wait_for_postgres() {
   done
 }
 
-# Only run on first init
-if [ "$1" = "postgres" ]; then
-  # Create sidecar DBs and users
-  IFS=',' read -ra DBS <<< "$POSTGRES_DB_SIDECARS"
-  for DB in "${DBS[@]}"; do
-    DB_TRIMMED=$(echo "$DB" | xargs)
-    if [ -z "$DB_TRIMMED" ]; then continue; fi
-    DB_LOWER=$(echo "$DB_TRIMMED" | tr '[:upper:]' '[:lower:]')
-    USER="${DB_LOWER}_user"
-    PASS="mydefaultpassword"
-    echo "Creating sidecar DB: $DB_TRIMMED and user: $USER"
-    psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
-      DO
-      $$
-      BEGIN
-        IF NOT EXISTS (SELECT FROM pg_database WHERE datname = '$DB_TRIMMED') THEN
-          CREATE DATABASE "$DB_TRIMMED";
-        END IF;
-        IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '$USER') THEN
-          CREATE ROLE "$USER" WITH LOGIN PASSWORD '$PASS';
-        END IF;
-        GRANT ALL PRIVILEGES ON DATABASE "$DB_TRIMMED" TO "$USER";
-      END
-      $$;
-EOSQL
-    # Enable pgvector if VECTOR_ prefix
-    if [[ "$DB_TRIMMED" =~ ^VECTOR_ ]]; then
-      echo "Enabling pgvector on $DB_TRIMMED"
-      psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname="$DB_TRIMMED" -c "CREATE EXTENSION IF NOT EXISTS vector;"
-    fi
-  done
-fi 
+# Create sidecar DBs and users
+IFS=',' read -ra DBS <<< "$POSTGRES_DB_SIDECARS"
+for DB in "${DBS[@]}"; do
+  DB_TRIMMED=$(echo "$DB" | xargs)
+  if [ -z "$DB_TRIMMED" ]; then continue; fi
+  DB_LOWER=$(echo "$DB_TRIMMED" | tr '[:upper:]' '[:lower:]')
+  USER="${DB_LOWER}_user"
+  PASS="mydefaultpassword"
+  echo "Creating sidecar DB: $DB_TRIMMED and user: $USER"
+
+  # Use the template file and envsubst
+  export DB_TRIMMED USER PASS
+  envsubst < /docker-entrypoint-initdb.d/init-multidb.sql.template > /tmp/init-multidb.sql
+  psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" -f /tmp/init-multidb.sql
+  rm -f /tmp/init-multidb.sql
+
+  # Enable pgvector if VECTOR_ prefix (case-insensitive)
+  if [[ "$DB_TRIMMED" =~ ^[Vv][Ee][Cc][Tt][Oo][Rr]_ ]]; then
+    echo "Enabling pgvector on $DB_TRIMMED"
+    psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname="$DB_TRIMMED" -c "CREATE EXTENSION IF NOT EXISTS vector;"
+  fi
+done 

init-multidb.sql.template

@@ -0,0 +1,16 @@
+-- Create database if it does not exist
+SELECT 'CREATE DATABASE "${DB_TRIMMED}"'
+WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '${DB_TRIMMED}')
+\gexec
+
+-- Create user and grant privileges
+DO
+$$
+BEGIN
+  IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '${USER}') THEN
+    CREATE ROLE "${USER}" WITH LOGIN PASSWORD '${PASS}';
+  END IF;
+END
+$$;
+
+GRANT ALL PRIVILEGES ON DATABASE "${DB_TRIMMED}" TO "${USER}";