Skip to content
Merged

Dev #2723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c9c856e
AB#33787 - Updated Scriban
hasanpour Jul 21, 2026
b862f6e
AB#33787 - Updated System.Security.Cryptography.Xml
hasanpour Jul 21, 2026
cd79024
AB#33787 - Overrided transitive Swashbuckle.AspNetCore package
hasanpour Jul 21, 2026
0fef750
AB#33787 - Pinned to a HtmlSanitizer prerelease
hasanpour Jul 21, 2026
39c8750
AB#33787 - Updated ABP and Microsoft packages
hasanpour Jul 22, 2026
c89347a
AB#33787 - Updated Data/EF-adjacent libs
hasanpour Jul 22, 2026
b400dea
AB#33787 - Updated infra/build tooling
hasanpour Jul 22, 2026
3f56031
AB#33787 - Updated Serilog
hasanpour Jul 22, 2026
71d6c91
AB#33787 - Test-only tooling patch bumps
hasanpour Jul 22, 2026
9daffb5
AB#33787 - Cleanup
hasanpour Jul 23, 2026
122e14e
Merge branch 'dev' into feature/AB#33787-Review-NuGet-packages
hasanpour Jul 23, 2026
feae7cd
AB#33787 - Updated comment
hasanpour Jul 23, 2026
4d2634e
AB#33787 - Rollbacked to the previous NPOI version due to unknown lic…
hasanpour Jul 23, 2026
e8985c4
AB#33787 - Swap obsolete Stateless API to async
hasanpour Jul 23, 2026
b693795
AB#33866 add AI worksheet field review
jacobwillsmith Jul 21, 2026
fd71be8
AB#33866 keep worksheet review available during cooldown
jacobwillsmith Jul 21, 2026
1441a2d
AB#33787 - Converted remaining Stateless sync guards to async
hasanpour Jul 23, 2026
7f1634c
AB#33414: Security Finding: Upload File Validation Uses Denylist
aurelio-aot Jul 23, 2026
838cded
AB#33866 simplify AI worksheet suggestions
jacobwillsmith Jul 24, 2026
1cd472f
AB#33866 fix worksheet test imports
jacobwillsmith Jul 24, 2026
e798bbb
AB#33866 update worksheet validator test
jacobwillsmith Jul 24, 2026
05cab89
AB#33866 remove worksheet mock generation
jacobwillsmith Jul 24, 2026
c2aa9fb
Merge branch 'dev' into feature/AB#33787-Review-NuGet-packages
hasanpour Jul 24, 2026
93cf98c
AB#33866 keep form generation prompts on v2
jacobwillsmith Jul 24, 2026
c23ed26
AB#33787 - Updated Markdig.Signed package
hasanpour Jul 24, 2026
ad0562e
AB#33787 - Updated test libs
hasanpour Jul 24, 2026
d80da67
bugfix/AB#33848-FixRolesAndAdjustColumnSizeForEmailCancel
JamesPasta Jul 24, 2026
ddcb022
Merge pull request #2713 from bcgov/bugfix/AB#33848-FixRolesEmailSche…
JamesPasta Jul 24, 2026
8db48bd
AB#33787 - Remove RestSharp in favor of IResilientHttpRequest
hasanpour Jul 24, 2026
126bfa8
AB#33424 Fix long running TokenCookie expiration
DarylTodosichuk Jul 24, 2026
00ac639
AB#33787 - Migrate RabbitMQ.Client 6.8.1 to 7.2.1 (async API)
hasanpour Jul 24, 2026
c82d2ab
AB#33415 removed SafeguardSql entirely
DarylTodosichuk Jul 24, 2026
61a5c09
AB#33866 retain AI worksheet suggestions for review
jacobwillsmith Jul 24, 2026
13d7dca
AB#33787 - Fixed Copilot raised issues.
hasanpour Jul 24, 2026
461339d
AB#33866 skip cooldown for pending worksheet review
jacobwillsmith Jul 25, 2026
4038368
AB#33414: Add more supported file types
aurelio-aot Jul 27, 2026
17fe662
AB#33414: AllowedFileTypes config should override DefaultAllowedFileT…
aurelio-aot Jul 27, 2026
e545e4f
AB#33414: Fix sonarqube issues
aurelio-aot Jul 27, 2026
db18cbc
Merge pull request #2716 from bcgov/bugfix/AB#33415-Security-Finding-…
JamesPasta Jul 28, 2026
69397a3
Merge pull request #2714 from bcgov/feature/AB#33787-Review-NuGet-pac…
JamesPasta Jul 28, 2026
d9c58fa
Merge pull request #2715 from bcgov/bugfix/AB#33424-Security-Finding-…
JamesPasta Jul 28, 2026
1440f0e
Merge pull request #2710 from bcgov/feature/AB#33866-ai-worksheet-fie…
JamesPasta Jul 28, 2026
32dc781
Merge pull request #2709 from bcgov/bugfix/AB#33414-Upload-File-Valid…
JamesPasta Jul 28, 2026
a6744d2
feature/AB#33419-ForwardForSecurity
JamesPasta Jul 28, 2026
abde7fe
AB#33905 - Changed to Reloade the application in a fresh and short-li…
hasanpour Jul 28, 2026
218481d
feature/AB#33419-ForwardForSecurity
JamesPasta Jul 28, 2026
7871d16
Merge pull request #2719 from bcgov/feature/AB#33419-ForwardForSecuri…
JamesPasta Jul 28, 2026
42b8796
AB#33905 - Removed unused using
hasanpour Jul 28, 2026
c534342
Merge pull request #2720 from bcgov/bugfix/AB#33905-AbpDbConcurrencyE…
hasanpour Jul 28, 2026
99f6f0b
AB#33654 Workflow migration changes
DarylTodosichuk Jul 29, 2026
93096fc
Merge pull request #2721 from bcgov/feature/AB#33654-github-workflow-…
DarylTodosichuk Jul 29, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 29 additions & 17 deletions .github/workflows/docker-build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ env:
GH_TOKEN: ${{secrets.GH_API_TOKEN}}
OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
OC_TOOLS_TOKEN: ${{ secrets.TOOLS_OPENSHIFT_TOKEN }}
OC_TOOLS_PROJECT: ${{ vars.TOOLS_OPENSHIFT_NAMESPACE }}
OC_TARGET_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
Expand All @@ -47,7 +49,7 @@ jobs:
run: |
echo "Target: $TARGET_ENV"
echo "BaseRef: $GITHUB_REF_NAME"
echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
echo "Environment: $TARGET_ENV OC_TOOLS_PROJECT=$OC_TOOLS_PROJECT OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
echo "..."
env | sort
Expand Down Expand Up @@ -124,36 +126,46 @@ jobs:
docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
working-directory: ./applications/Unity.GrantManager
- name: Connect to JFrog Artifactory non-interactive login using --password-stdin
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
- name: Push application images to Artifactory container registry
continue-on-error: true
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
- name: Disconnect docker from JFrog Artifactory
run: |
docker logout
docker logout $JFROG_SERVICE
- name: Install OpenShift CLI
run: |
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
tar -xvf oc.tar.gz
sudo mv oc /usr/local/bin
- name: Verify OpenShift CLI installation
run: oc version
- name: Connect to OpenShift API non-interactive login using current session token
- name: Push application images into ce395f-tools
run: |
oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
oc login --token=$OC_TOOLS_TOKEN --server=$OC_CLUSTER
oc registry login
docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
- name: Push application images to OpenShift container registry
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
docker logout $OC_REGISTRY
- name: Promote dbMigrator into ce395f-dev and run migrations
run: |
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
- name: Disconnect docker from OpenShift container registry
oc login --token=$OC_TARGET_TOKEN --server=$OC_CLUSTER
oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
oc -n $OC_TARGET_PROJECT delete jobs $TARGET_ENV-unity-dbmigrator --ignore-not-found=true
oc -n $OC_TARGET_PROJECT process unity-grantmanager-dbmigrator-job \
-p APPLICATION_GROUP=$TARGET_ENV-unity-grantmanager \
-p DATABASE_SERVICE_NAME=$TARGET_ENV-unity-data-postgres \
-p APPLICATION_NAME=$TARGET_ENV-unity-dbmigrator \
-p IMAGEPULL_NAMESPACE=$OC_TARGET_PROJECT \
-p IMAGESTREAM_NAME=$TARGET_ENV-unity-dbmigrator \
-p IMAGESTREAM_TAG=latest | oc -n $OC_TARGET_PROJECT create -f -
oc -n $OC_TARGET_PROJECT wait jobs/$TARGET_ENV-unity-dbmigrator --for condition=complete --timeout=300s
- name: Promote grantmanager-web into ce395f-dev and wait
run: |
docker logout
oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
oc -n $OC_TARGET_PROJECT rollout status deployment/$TARGET_ENV-unity-grantmanager-web --timeout=180s
120 changes: 120 additions & 0 deletions .github/workflows/docker-build-dev2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name: Dev2 - Build & Push docker images

on:
push:
branches: [ "dev2" ]
paths-ignore:
- '.github/**'
- '.gitignore'
- 'database/**'
- 'documentation/**'
- '**/docs/**'
- '**/README*'
- 'CODE_OF_CONDUCT.md'
- 'COMPLIANCE.yaml'
- 'CONTRIBUTING.md'
- 'LICENSE'
- 'README.md'
- 'SECURITY.md'
# Allow manual workflow triggering
workflow_dispatch:

env:
TARGET_ENV: dev2
GH_TOKEN: ${{secrets.GH_API_TOKEN}}
OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
OC_TARGET_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
JFROG_REPO_PATH: ${{ vars.ARTIFACTORY_REPO }}
JFROG_SERVICE: ${{ vars.ARTIFACTORY_SERVICE }}

jobs:
Setup:
runs-on: ubuntu-latest
environment: dev2
permissions:
contents: read
steps:
- name: Get variables
run: |
echo "Target: $TARGET_ENV"
echo "BaseRef: $GITHUB_REF_NAME"
echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
echo "..."
env | sort
Branch:
needs: [Setup]
runs-on: ubuntu-latest
environment: dev2
permissions:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v6
with:
fetch-depth: '1'
- name: Get short commitId
id: get_commit
run: |
echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
outputs:
SHA_SHORT: ${{steps.get_commit.outputs.SHA_SHORT}}
Build:
needs: [Setup,Branch]
runs-on: ubuntu-latest
environment: dev2
permissions:
contents: read
steps:
- uses: actions/checkout@v6
- name: Build Docker images
run: |
rm -f ./docker-compose.override.yml
docker build --build-arg UNITY_BUILD_VERSION=dev2 --build-arg UNITY_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
working-directory: ./applications/Unity.GrantManager
- name: Push application images to Artifactory container registry
continue-on-error: true
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
docker logout $JFROG_SERVICE
- name: Install OpenShift CLI
run: |
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
tar -xvf oc.tar.gz
sudo mv oc /usr/local/bin
- name: Verify OpenShift CLI installation
run: oc version
- name: Push application images into ce395f-dev (no ce395f-tools hop for dev2)
run: |
oc login --token=$OC_TARGET_TOKEN --server=$OC_CLUSTER
oc registry login
docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
docker logout $OC_REGISTRY
- name: Run dbMigrator Job
run: |
oc -n $OC_TARGET_PROJECT delete jobs $TARGET_ENV-unity-dbmigrator --ignore-not-found=true
oc -n $OC_TARGET_PROJECT process unity-grantmanager-dbmigrator-job \
-p APPLICATION_GROUP=$TARGET_ENV-unity-grantmanager \
-p DATABASE_SERVICE_NAME=$TARGET_ENV-unity-data-postgres \
-p APPLICATION_NAME=$TARGET_ENV-unity-dbmigrator \
-p IMAGEPULL_NAMESPACE=$OC_TARGET_PROJECT \
-p IMAGESTREAM_NAME=$TARGET_ENV-unity-dbmigrator \
-p IMAGESTREAM_TAG=latest | oc -n $OC_TARGET_PROJECT create -f -
oc -n $OC_TARGET_PROJECT wait jobs/$TARGET_ENV-unity-dbmigrator --for condition=complete --timeout=300s
- name: Roll out grantmanager-web and wait
run: |
oc -n $OC_TARGET_PROJECT rollout restart deployment/$TARGET_ENV-unity-grantmanager-web
oc -n $OC_TARGET_PROJECT rollout status deployment/$TARGET_ENV-unity-grantmanager-web --timeout=180s
33 changes: 13 additions & 20 deletions .github/workflows/docker-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ env:
GH_TOKEN: ${{secrets.GH_API_TOKEN}}
OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
OC_TOOLS_TOKEN: ${{ secrets.TOOLS_OPENSHIFT_TOKEN }}
OC_TOOLS_PROJECT: ${{ vars.TOOLS_OPENSHIFT_NAMESPACE }}
JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
JFROG_REPO_PATH: ${{ vars.ARTIFACTORY_REPO }}
Expand All @@ -47,7 +47,7 @@ jobs:
run: |
echo "Target: $TARGET_ENV"
echo "BaseRef: $GITHUB_REF_NAME"
echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
echo "Environment: $TARGET_ENV OC_TOOLS_PROJECT=$OC_TOOLS_PROJECT"
echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
echo "..."
env | sort
Expand Down Expand Up @@ -181,36 +181,29 @@ jobs:
docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
working-directory: ./applications/Unity.GrantManager
- name: Connect to JFrog Artifactory non-interactive login using --password-stdin
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
- name: Push application images to Artifactory container registry
continue-on-error: true
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:stable
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:stable
docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:stable
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:stable
- name: Disconnect docker from JFrog Artifactory
run: |
docker logout
docker logout $JFROG_SERVICE
- name: Install OpenShift CLI
run: |
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
tar -xvf oc.tar.gz
sudo mv oc /usr/local/bin
- name: Verify OpenShift CLI installation
run: oc version
- name: Connect to OpenShift API non-interactive login using current session token
- name: Push application images into ce395f-tools
run: |
oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
oc login --token=$OC_TOOLS_TOKEN --server=$OC_CLUSTER
oc registry login
docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
- name: Push application images to OpenShift container registry
run: |
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator:stable
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator:stable
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web:stable
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web:stable
- name: Disconnect docker from OpenShift container registry
run: |
docker logout
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:stable
docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:stable
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:stable
docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:stable
docker logout $OC_REGISTRY
46 changes: 29 additions & 17 deletions .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ env:
GH_TOKEN: ${{secrets.GH_API_TOKEN}}
OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
OC_TOOLS_TOKEN: ${{ secrets.TOOLS_OPENSHIFT_TOKEN }}
OC_TOOLS_PROJECT: ${{ vars.TOOLS_OPENSHIFT_NAMESPACE }}
OC_TARGET_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
OC_TARGET_PROJECT: ${{ vars.OPENSHIFT_NAMESPACE }}
JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
Expand All @@ -47,7 +49,7 @@ jobs:
run: |
echo "Target: $TARGET_ENV"
echo "BaseRef: $GITHUB_REF_NAME"
echo "Environment: $TARGET_ENV OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
echo "Environment: $TARGET_ENV OC_TOOLS_PROJECT=$OC_TOOLS_PROJECT OC_TARGET_PROJECT=$OC_TARGET_PROJECT"
echo "Environment: $TARGET_ENV JFROG_REPO_PATH=$JFROG_REPO_PATH"
echo "..."
env | sort
Expand Down Expand Up @@ -160,36 +162,46 @@ jobs:
docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile .
docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile .
working-directory: ./applications/Unity.GrantManager
- name: Connect to JFrog Artifactory non-interactive login using --password-stdin
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
- name: Push application images to Artifactory container registry
continue-on-error: true
run: |
echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
- name: Disconnect docker from JFrog Artifactory
run: |
docker logout
docker logout $JFROG_SERVICE
- name: Install OpenShift CLI
run: |
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
tar -xvf oc.tar.gz
sudo mv oc /usr/local/bin
- name: Verify OpenShift CLI installation
run: oc version
- name: Connect to OpenShift API non-interactive login using current session token
- name: Push application images into ce395f-tools
run: |
oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
oc login --token=$OC_TOOLS_TOKEN --server=$OC_CLUSTER
oc registry login
docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
- name: Push application images to OpenShift container registry
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
docker push $OC_REGISTRY/$OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest
docker logout $OC_REGISTRY
- name: Promote dbMigrator into ce395f-test and run migrations
run: |
docker tag unity-grantmanager-dbmigrator $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-dbmigrator
docker tag unity-grantmanager-web $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
docker push $OC_REGISTRY/$OC_TARGET_PROJECT/unity-grantmanager-web
- name: Disconnect docker from OpenShift container registry
oc login --token=$OC_TARGET_TOKEN --server=$OC_CLUSTER
oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-dbmigrator-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-dbmigrator:latest
oc -n $OC_TARGET_PROJECT delete jobs $TARGET_ENV-unity-dbmigrator --ignore-not-found=true
oc -n $OC_TARGET_PROJECT process unity-grantmanager-dbmigrator-job \
-p APPLICATION_GROUP=$TARGET_ENV-unity-grantmanager \
-p DATABASE_SERVICE_NAME=$TARGET_ENV-unity-data-postgres \
-p APPLICATION_NAME=$TARGET_ENV-unity-dbmigrator \
-p IMAGEPULL_NAMESPACE=$OC_TARGET_PROJECT \
-p IMAGESTREAM_NAME=$TARGET_ENV-unity-dbmigrator \
-p IMAGESTREAM_TAG=latest | oc -n $OC_TARGET_PROJECT create -f -
oc -n $OC_TARGET_PROJECT wait jobs/$TARGET_ENV-unity-dbmigrator --for condition=complete --timeout=300s
- name: Promote grantmanager-web into ce395f-test and wait
run: |
docker logout
oc tag $OC_TOOLS_PROJECT/$TARGET_ENV-unity-grantmanager-build:latest $OC_TARGET_PROJECT/$TARGET_ENV-unity-grantmanager:latest
oc -n $OC_TARGET_PROJECT rollout status deployment/$TARGET_ENV-unity-grantmanager-web --timeout=180s
2 changes: 1 addition & 1 deletion applications/Unity.GrantManager/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AuthServer__OidcSignoutCallback="http://localhost:44342/signout-callback-oidc"
##S3__SecretAccessKey="******************"
##S3__ApplicationS3Folder="Unity/Application"
##S3__AssessmentS3Folder="Unity/Adjudication"
##S3__DisallowedFileTypes="[ "exe" , "sh" , "ksh" , "bat" , "cmd" ]"
##S3__AllowedFileTypes=["pdf","doc","docx","xls","xlsx","ppt","pptx","jpg","jpeg","png","gif","txt","csv","zip","odt","ods","odp","rtf","bmp","tif","tiff","webp","heic","heif","eml","msg"]
##S3__MaxFileSize="25"
##S3__EmailAttachmentMaxFileSize="20"
##S3__EmailAttachmentsTotalMaxFileSize="25"
Expand Down
2 changes: 1 addition & 1 deletion applications/Unity.GrantManager/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<!-- Explicitly reference compatible version to avoid transitive dependency warnings -->
<PackageReference Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.1.0" />
<PackageReference Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.8.0" />

</ItemGroup>

Expand Down
Loading
Loading