Marge swiftparcel_web into development

.github/workflows/cloudDeployment.yml

@@ -0,0 +1,57 @@
+name: Deploy to Cloud
+
+on:
+  push:
+    branches:
+      - swiftparcel_web  # Set this to the branch you want to deploy from
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up SSH
+      run: |
+        mkdir -p ~/.ssh/
+        echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh-keyscan -H ${{ secrets.DROPLET_IP }} >> ~/.ssh/known_hosts
+        cat ~/.ssh/known_hosts # Add this line to confirm that the key is added
+
+    - name: Check the structure
+      run: |
+        pwd
+        ls -la
+
+    - name: Docker Login
+      run: |
+        echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
+    - name: Run dockerize_all.sh
+      run: |
+        chmod +x ./SwiftParcel/d-docker-compose/dockerize_all.sh
+        ./SwiftParcel/d-docker-compose/dockerize_all.sh
+
+    - name: Check the structure 2
+      run: |
+        pwd
+        ls -la
+
+    - name: Test SSH Connection
+      run: |
+        ssh -vvv root@${{ secrets.DROPLET_IP }} "echo SSH Connection Successful"
+
+    - name: Stop and Remove Containers
+      run: |
+        ssh root@${{ secrets.DROPLET_IP }} "docker ps -q --filter network=swiftparcel-network | xargs -r docker stop && docker ps -a -q --filter network=swiftparcel-network | xargs -r docker rm"
+
+    - name: Clean up existing Cloud networks
+      run: |
+        ssh root@${{ secrets.DROPLET_IP }} "docker network rm swiftparcel-network || true"
+
+    - name: Deploy to Cloud
+      run: |
+        scp -r ./SwiftParcel/d-docker-compose root@${{ secrets.DROPLET_IP }}:${{ secrets.CLOUD_PROJECT_PATH }}
+        ssh root@${{ secrets.DROPLET_IP }} "cd ${{ secrets.CLOUD_PROJECT_PATH }}/SwiftParcel/d-docker-compose && docker-compose -f ${{ secrets.CLOUD_DEPLOYMENT_FILE }} pull && docker-compose -f ${{ secrets.CLOUD_DEPLOYMENT_FILE }} up -d --force-recreate"

SwiftParcel.API.Gateway/Dockerfile

@@ -9,5 +9,5 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0
 WORKDIR /app
 COPY --from=build /app/out .
 ENV ASPNETCORE_URLS http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-ENTRYPOINT ["dotnet", "SwiftParcel.Services.Customers.Api.dll"]
+ENV ASPNETCORE_ENVIRONMENT production
+ENTRYPOINT ["dotnet", "SwiftParcel.API.Gateway.dll"]

SwiftParcel.API.Gateway/scripts/dockerize.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+export ASPNETCORE_ENVIRONMENT=Development
+
+cd ../
+
+docker build -t swift-parcel-apigateway-service:latest .
+
+docker tag swift-parcel-apigateway-service:latest adrianvsaint/swift-parcel-apigateway-service:latest
+
+docker push adrianvsaint/swift-parcel-apigateway-service
+
+docker push swiftparcel/swift-parcel-apigateway-service

SwiftParcel.API.Gateway/src/SwiftParcel.API.Gateway/appsettings.json

@@ -11,15 +11,15 @@
       },
       "seq": {
           "enabled": true,
-          "url": "http://localhost:5341",
+          "url": "http://seq:5341",
           "apiKey": "secret"
       }
   },
   "metrics": {
       "enabled": true,
       "influxEnabled": false,
       "prometheusEnabled": true,
-      "influxUrl": "http://localhost:8086",
+      "influxUrl": "http://influx:8086",
       "database": "swiftparcel",
       "env": "local",
       "interval": 5

SwiftParcel.API.Gateway/src/SwiftParcel.API.Gateway/appsettings.production.json

@@ -0,0 +1,27 @@
+{
+  "logger": {
+      "excludePaths": ["/", "/ping", "/metrics"],
+      "console": {
+          "enabled": true
+      },
+      "file": {
+          "enabled": true,
+          "path": "logs/logs.txt",
+          "interval": "day"
+      },
+      "seq": {
+          "enabled": true,
+          "url": "http://seq:5341",
+          "apiKey": "secret"
+      }
+  },
+  "metrics": {
+      "enabled": true,
+      "influxEnabled": false,
+      "prometheusEnabled": true,
+      "influxUrl": "http://influx:8086",
+      "database": "swiftparcel",
+      "env": "local",
+      "interval": 5
+  }
+}