Test

bcgov · Dec 17, 2024 · 65b0436 · 65b0436
1 parent c61b294
commit 65b0436
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -78,6 +78,7 @@ jobs:
             -p TARGET=${{ inputs.target }}
             -p SSOAUTH=${{ vars.SSO_AUTH_SERVER_URL }}
             -p DB_PASSWORD=${{ secrets.DB_PASSWORD }}
+            -P DATABASE_URL=postgresql://${{ secrets.DB_USER }}:${{ secrets.DB_PASSWORD }}@nr-nmp-database-${{ inputs.target }}:${{ secrets.DB_PORT }}/${{ secrets.DB_NAME }}?schema=public
           verification_path: /api/health
           verification_retry_attempts: "5"
           verification_retry_seconds: "15"

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -22,6 +22,9 @@ parameters:
   - name: SSOAUTH
     description: SSO Auth Server URL
     required: true
+  - name: DATABASE_URL
+    description: Database URL
+    required: true
 objects:
   - kind: Service
     apiVersion: v1
@@ -101,8 +104,7 @@ objects:
                 - name: BACKEND_URL
                   value: https://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca
                 - name: DATABASE_URL
-                  value: nr-nmp-database-${TARGET}://postgres:${DB_PASSWORD}@nr-nmp-database-${TARGET}:5432/postgres
-              ports:
+                  value: ${DATABASE_URL}
                 - containerPort: 3000
                   protocol: TCP
               readinessProbe:

diff --git a/database/Dockerfile b/database/Dockerfile
@@ -1,7 +1,7 @@
 FROM postgis/postgis:15-master
 
 # Copy startup scripts
-COPY db/entrypoint/* /docker-entrypoint-initdb.d/
+# COPY db/entrypoint/* /docker-entrypoint-initdb.d/
 
 # User, port and Healthcheck
 USER postgres

diff --git a/database/db/entrypoint/01-initseed.sql b/database/db/entrypoint/01-initseed.sql