From d5a1cb9946f452c652f32e0f3f08f3d143da7de0 Mon Sep 17 00:00:00 2001 From: taiphanvan2k3 Date: Fri, 14 Nov 2025 13:26:48 +0700 Subject: [PATCH 1/2] feat: Update Google Cloud deployment configuration and add production appsettings --- .github/workflows/deploy-gcloud.yml | 13 +++++++------ src/Web.Api/appsettings.Production.json | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 src/Web.Api/appsettings.Production.json diff --git a/.github/workflows/deploy-gcloud.yml b/.github/workflows/deploy-gcloud.yml index 9701237..9cfe4c4 100644 --- a/.github/workflows/deploy-gcloud.yml +++ b/.github/workflows/deploy-gcloud.yml @@ -32,6 +32,7 @@ env: REPOSITORY: backendnetcore IMAGE_NAME: webapi SERVICE_NAME: legal-assistant-api + PORT: 10000 jobs: build-and-deploy: @@ -100,11 +101,11 @@ jobs: --platform managed \ --region ${{ env.REGION }} \ --allow-unauthenticated \ - --memory 512Mi \ - --cpu 1 \ + --memory 4Gi \ + --cpu 2 \ --max-instances 10 \ --min-instances 0 \ - --port 8080 \ + --port ${{ env.PORT }} \ --set-env-vars "ASPNETCORE_ENVIRONMENT=Production" \ --quiet @@ -116,11 +117,11 @@ jobs: --platform managed \ --region ${{ env.REGION }} \ --allow-unauthenticated \ - --memory 512Mi \ - --cpu 1 \ + --memory 4Gi \ + --cpu 2 \ --max-instances 5 \ --min-instances 0 \ - --port 8080 \ + --port ${{ env.PORT }} \ --set-env-vars "ASPNETCORE_ENVIRONMENT=Staging" \ --quiet diff --git a/src/Web.Api/appsettings.Production.json b/src/Web.Api/appsettings.Production.json new file mode 100644 index 0000000..bd32633 --- /dev/null +++ b/src/Web.Api/appsettings.Production.json @@ -0,0 +1,23 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "ConnectionStrings": { + "DefaultConnection": "Host=69.164.244.36;Database=law_chatbot;Username=postgres;Password=Admin@123;Port=5555" + }, + "AppSettings": { + "BaseUrl": "http://localhost:10000" + }, + "Email": { + "Enabled": true, + "FromEmail": "legalassistant.dut@gmail.com", + "FromName": "Legal Assistant", + "SmtpHost": "smtp.gmail.com", + "SmtpPort": 587, + "SmtpUsername": "legalassistant.dut@gmail.com", + "SmtpPassword": "uomycajntiuixmki" + } +} From 002f45c4f974c944a56e1fe9415c417841e0d26a Mon Sep 17 00:00:00 2001 From: taiphanvan2k3 Date: Fri, 14 Nov 2025 13:47:07 +0700 Subject: [PATCH 2/2] feat: Add conditional checks for Docker image tagging and pushing in CI/CD workflow --- .github/workflows/deploy-gcloud.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-gcloud.yml b/.github/workflows/deploy-gcloud.yml index 9cfe4c4..0f36b6e 100644 --- a/.github/workflows/deploy-gcloud.yml +++ b/.github/workflows/deploy-gcloud.yml @@ -78,6 +78,7 @@ jobs: docker build -t ${{ env.IMAGE_NAME }}:latest -f src/Web.Api/Dockerfile . - name: Tag Docker image + if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' run: | REMOTE_IMAGE="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}" REMOTE_IMAGE_LATEST="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.IMAGE_NAME }}:latest" @@ -89,6 +90,7 @@ jobs: echo "REMOTE_IMAGE_LATEST=${REMOTE_IMAGE_LATEST}" >> $GITHUB_ENV - name: Push Docker image to Artifact Registry + if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' run: | docker push ${{ env.REMOTE_IMAGE }} docker push ${{ env.REMOTE_IMAGE_LATEST }}