diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index b3928db44..59fbd533f 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -101,7 +101,6 @@ jobs: parameters: -p DB_PVC_SIZE=128Mi overwrite: false - triggers: ('common/' 'database/' 'backend/' 'frontend/') - name: backend file: backend/openshift.deploy.yml overwrite: true @@ -110,12 +109,10 @@ jobs: -p MAX_REPLICAS=1 -p BUILD=snapshot-${{ needs.init.outputs.tag }} -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }} - triggers: ('common/' 'database/' 'backend/' 'frontend/') verification_path: "actuator/health" - name: fluentbit file: common/openshift.fluentbit.yml overwrite: true - triggers: ('common/' 'database/' 'backend/' 'frontend/' 'oracle-api/') - name: frontend file: frontend/openshift.deploy.yml overwrite: true @@ -126,7 +123,6 @@ jobs: -p MAX_REPLICAS=1 -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }} -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }} - triggers: ('common/' 'database/' 'backend/' 'oracle-api/' 'frontend/') - name: oracle-api file: oracle-api/openshift.deploy.yml overwrite: true diff --git a/docker-compose.yml b/docker-compose.yml index d8a57e7d3..d09c83b0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,7 @@ services: FORESTCLIENTAPI_KEY: "${FORESTCLIENTAPI_KEY}" ORACLE_SERVER_URL: https://nr-spar-test-oracle-api.apps.silver.devops.gov.bc.ca POSTGRES_HOST: database - AWS_COGNITO_ISSUER_URI: "${AWS_COGNITO_ISSUER_URI}" + AWS_COGNITO_ISSUER_URI: "https://cognito-idp.ca-central-1.amazonaws.com/ca-central-1_t2HSZBHur" <<: *db-vars ports: ["8090:8090", "5005:5005"] image: maven:3.9.6-eclipse-temurin-17 @@ -107,6 +107,7 @@ services: SERVER_PORT: "8091" ORACLEDB_KEYSTORE: /app/jssecacerts ORACLEDB_SECRET: changeit + AWS_COGNITO_ISSUER_URI: "https://cognito-idp.ca-central-1.amazonaws.com/ca-central-1_t2HSZBHur" profiles: ["oracle"] network_mode: host image: maven:3.9.6-eclipse-temurin-17