From 1d3c5aaf7d94253ef6b8a831853fe2699ea65c50 Mon Sep 17 00:00:00 2001 From: Dallas Richmond Date: Mon, 16 Dec 2024 16:04:56 -0800 Subject: [PATCH] Updated url --- .github/workflows/.deploy.yml | 6 ++++-- backend/openshift.deploy.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index 67d74c5..8c74bd3 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -64,8 +64,6 @@ jobs: needs: [init, database] environment: ${{ inputs.environment }} runs-on: ubuntu-22.04 - env: - DATABASE_URL: postgres://${{ secrets.DB_USER }}:${{ secrets.DB_PASSWORD }}@${{ vars.OC_SERVER }}:${{ secrets.DB_PORT }}/${{ secrets.DB_NAME }} steps: - name: Deploy Backend uses: bcgov-nr/action-deployer-openshift@v3.0.1 @@ -79,6 +77,10 @@ jobs: -p IMAGE_TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} -p SSOAUTH=${{ vars.SSO_AUTH_SERVER_URL }} + -p DB_PASSWORD=${{ secrets.DB_PASSWORD }} + -p DB_USER=${{ secrets.DB_USER }} + -p DB_NAME=${{ secrets.DB_NAME }} + -p DB_PORT=${{ secrets.DB_PORT }} verification_path: /api/health verification_retry_attempts: "5" verification_retry_seconds: "15" diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml index 4e1038c..7244fa5 100644 --- a/backend/openshift.deploy.yml +++ b/backend/openshift.deploy.yml @@ -101,6 +101,8 @@ objects: value: https://${APP}-${TARGET}.apps.silver.devops.gov.bc.ca - name: BACKEND_URL value: https://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca + - name: DATABASE_URL + value: postgresql://postgres:${DB_PASSWORD}@postgres:5432/postgres ports: - containerPort: 3000 protocol: TCP