new envs and avoids error upon recreationg

Author: pcrespov

.env-devel

@@ -152,6 +152,10 @@ POSTGRES_PASSWORD=adminadmin
 POSTGRES_PORT=5432
 POSTGRES_USER=scu
 
+POSTGRES_READONLY_PASSWORD=adminadmin
+POSTGRES_READONLY_USER=scu-ro
+
+
 RABBIT_HOST=rabbit
 RABBIT_PASSWORD=adminadmin
 RABBIT_PORT=5672

services/docker-compose.yml

@@ -1134,7 +1134,10 @@ services:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_READONLY_PASSWORD: ${POSTGRES_READONLY_PASSWORD}
+      POSTGRES_READONLY_USER: ${POSTGRES_READONLY_USER}
     volumes:
+      - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       - postgres_data:/var/lib/postgresql/data
       - type: tmpfs
         target: /dev/shm

services/postgres/docker-entrypoints-initdb.d/create-readonly-user.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-# Check if POSTGRES_READONLY_USER and POSTGRES_READONLY_PASSWORD are defined
+# NOTE: POSTGRES_READONLY_USER and POSTGRES_READONLY_PASSWORD are optional
 if [[ -z "${POSTGRES_READONLY_USER}" || -z "${POSTGRES_READONLY_PASSWORD}" ]]; then
   echo "Skipping read-only user creation because POSTGRES_READONLY_USER or POSTGRES_READONLY_PASSWORD is not set."
   exit 0
@@ -11,16 +11,26 @@ fi
 readonly_user=${POSTGRES_READONLY_USER}
 readonly_password=${POSTGRES_READONLY_PASSWORD}
 database=${POSTGRES_DB}
-schema=${SCHEMA:-public}
+schema=${SCHEMA:-public} # TODO: what is this???
 
 echo "Creating read-only user: $readonly_user"
 
-# Create the read-only user and assign permissions
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$database" <<-EOSQL
-  CREATE USER $readonly_user WITH PASSWORD '$readonly_password';
-  GRANT CONNECT ON DATABASE $database TO $readonly_user;
-  GRANT USAGE ON SCHEMA $schema TO $readonly_user;
-  GRANT SELECT ON ALL TABLES IN SCHEMA $schema TO $readonly_user;
-  GRANT SELECT ON ALL SEQUENCES IN SCHEMA $schema TO $readonly_user;
-  ALTER DEFAULT PRIVILEGES IN SCHEMA $schema GRANT SELECT ON TABLES TO $readonly_user;
-EOSQL
+
+# Check if the user already exists
+user_exists=$(psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='$readonly_user'")
+
+if [[ $user_exists == "1" ]]; then
+  echo "User '$readonly_user' already exists, skipping creation."
+else
+  echo "Creating read-only user: $readonly_user"
+
+  # Create the read-only user and assign permissions
+  psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$database" <<-EOSQL
+    CREATE USER $readonly_user WITH PASSWORD '$readonly_password';
+    GRANT CONNECT ON DATABASE $database TO $readonly_user;
+    GRANT USAGE ON SCHEMA $schema TO $readonly_user;
+    GRANT SELECT ON ALL TABLES IN SCHEMA $schema TO $readonly_user;
+    GRANT SELECT ON ALL SEQUENCES IN SCHEMA $schema TO $readonly_user;
+    ALTER DEFAULT PRIVILEGES IN SCHEMA $schema GRANT SELECT ON TABLES TO $readonly_user;
+  EOSQL
+fi