DEV_DB change db creds

.env

@@ -1,6 +1,6 @@
 POSTGRES_DB=no_copy_
-POSTGRES_USER=postgres
+POSTGRES_USER=ncp_db
-POSTGRES_PASSWORD=postgres
+POSTGRES_PASSWORD=ncpDbApp
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 

docker-compose.yaml

@@ -18,7 +18,7 @@ services:
     restart: unless-stopped
 
   db:
-    image: postgres:17
+    image: postgres:17.7
     restart: always
     deploy:
       resources:
@@ -30,14 +30,17 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+#      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+#      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_SHARED_BUFFERS: 512MB
       POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -61,8 +64,10 @@ services:
 #      FILE_CHUNK_SIZE: 1048576
       FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+#      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+#      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
       STORAGE_SERVICE_URL: http://storage:8081
@@ -82,6 +87,10 @@ services:
           - api
     volumes:
       - uploads_data:/data/uploads:rw
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
+      interval: 10s
+      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1

infrastructure/jenkins/deploy.groovy

@@ -30,6 +30,7 @@ pipeline {
             }
         }
 
+
         stage('Deploy with docker-compose') {
             steps {
                 script {
@@ -38,7 +39,9 @@ pipeline {
                                     credentialsId: 'server-root-password',
                                     usernameVariable: 'SSH_USER',
                                     passwordVariable: 'SSH_PASS'
-                            )
+                            ),
+                            string(credentialsId: 'db-user', variable: 'DB_USER'),
+                            string(credentialsId: 'db-password', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
                     echo "Deploying branch: ${params.BRANCH}"
@@ -77,8 +80,8 @@ pipeline {
                           -p 80:8080 \\
                           -v uploads_data:/data/uploads:rw \\
                           -e POSTGRES_DB=no_copy_ \\
-                                  -e POSTGRES_USER=postgres \\
+                          -e POSTGRES_USER=$DB_USER \\
-                                  -e POSTGRES_PASSWORD=postgres \\
+                          -e POSTGRES_PASSWORD=$DB_PASSWORD \\
                           -e POSTGRES_PORT=5432 \\
                           -e POSTGRES_HOST=db \\
                           --restart unless-stopped \\

init-scripts/init-user.sql

@@ -0,0 +1,19 @@
+DO
+$do$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = 'ncp_db') THEN
+      CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+END IF;
+END
+$do$;
+
+DO
+$do$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_database WHERE datname = 'no_copy_') THEN
+      CREATE DATABASE no_copy_ OWNER ncp_db;
+END IF;
+END
+$do$;
+
+GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;