modify pipeline to speed up deployment

.github/workflows/deploy-freight.yml

@@ -0,0 +1,71 @@
+name: Deploy Freight
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+      - staging
+    paths:
+      - "apps/edr-freight-api/**"
+      - "apps/edr-freight-web/**"
+      - "packages/**"
+      - "infrastructure/docker/Dockerfile.web"
+      - "infrastructure/nginx/**"
+      - "docker-compose.yaml"
+      - "pnpm-lock.yaml"
+      - "scripts/deploy/**"
+      - ".github/workflows/deploy-freight.yml"
+  workflow_dispatch:
+
+concurrency:
+  group: deploy-freight-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    name: Build and deploy freight stack
+    runs-on: self-hosted
+    env:
+      PROJECT: edr-freight
+      BRANCH: ${{ github.ref_name }}
+      DEPLOY_USER: user
+      BUILD_ENV_FILE: freight-web.build.env
+      DOCKER_BUILDKIT: "1"
+      COMPOSE_DOCKER_CLI_BUILD: "1"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Sync environment from server
+        run: |
+          chmod +x scripts/deploy/*.sh
+          ./scripts/deploy/sync-env-from-server.sh \
+            freight-api \
+            freight-portal \
+            freight-backoffice
+
+      - name: Configure npm auth for Docker builds
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: ./scripts/deploy/create-npmrc.sh
+
+      - name: Build images
+        run: |
+          set -euo pipefail
+          docker compose build \
+            freight-api \
+            freight-portal \
+            freight-backoffice
+
+      - name: Deploy containers
+        run: |
+          set -euo pipefail
+          docker compose up -d \
+            freight-api \
+            freight-portal \
+            freight-backoffice
+
+      - name: Remove npm credentials from workspace
+        if: always()
+        run: rm -f .npmrc .npmrc_temp

.github/workflows/deploy-passenger.yml

@@ -0,0 +1,71 @@
+name: Deploy Passenger
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+      - staging
+    paths:
+      - "apps/edr-passenger-api/**"
+      - "apps/edr-passenger-web/**"
+      - "packages/**"
+      - "infrastructure/docker/Dockerfile.web"
+      - "infrastructure/nginx/**"
+      - "docker-compose.yaml"
+      - "pnpm-lock.yaml"
+      - "scripts/deploy/**"
+      - ".github/workflows/deploy-passenger.yml"
+  workflow_dispatch:
+
+concurrency:
+  group: deploy-passenger-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    name: Build and deploy passenger stack
+    runs-on: self-hosted
+    env:
+      PROJECT: edr-passenger
+      BRANCH: ${{ github.ref_name }}
+      DEPLOY_USER: user
+      BUILD_ENV_FILE: passenger-web.build.env
+      DOCKER_BUILDKIT: "1"
+      COMPOSE_DOCKER_CLI_BUILD: "1"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Sync environment from server
+        run: |
+          chmod +x scripts/deploy/*.sh
+          ./scripts/deploy/sync-env-from-server.sh \
+            passenger-api \
+            passenger-portal \
+            passenger-backoffice
+
+      - name: Configure npm auth for Docker builds
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: ./scripts/deploy/create-npmrc.sh
+
+      - name: Build images
+        run: |
+          set -euo pipefail
+          docker compose build \
+            passenger-api \
+            passenger-portal \
+            passenger-backoffice
+
+      - name: Deploy containers
+        run: |
+          set -euo pipefail
+          docker compose up -d \
+            passenger-api \
+            passenger-portal \
+            passenger-backoffice
+
+      - name: Remove npm credentials from workspace
+        if: always()
+        run: rm -f .npmrc .npmrc_temp

.github/workflows/deploy.yaml

@@ -1,96 +0,0 @@
-name: Automatic Deployment
-
-on:
-  push:
-    branches:
-      - dev
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  environment:
-    name: 🌍 Setup Environment
-    runs-on: [self-hosted]
-    outputs:
-      target: ${{ steps.dev.outputs.target || steps.staging.outputs.target }}
-    steps:
-      - name: Verify NPM Token
-        env:
-          # We map the secret here to check its existence
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          if [ -z "$NPM_TOKEN" ]; then
-            echo "::error::The NPM_TOKEN secret is missing or empty. Please add it to your GitHub Secrets."
-            exit 1
-          fi
-          echo "NPM_TOKEN is present, proceeding with build..."
-
-      - name: 🛠️ Set Development Environment
-        id: dev
-        if: ${{github.ref_name == 'dev'}}
-        run: |
-          echo "target=dev" >> $GITHUB_OUTPUT
-      - name: 🚀 Set Staging Environment
-        id: staging
-        if: ${{github.ref_name == 'staging'}}
-        run: |
-          echo "target=staging" >> $GITHUB_OUTPUT
-
-  build-base-image:
-    name: 🏗️ Build Base Image
-    runs-on: [self-hosted, dev]
-    needs: [environment]
-    steps:
-      - name: 🔍 Checkout
-        uses: actions/checkout@v4
-
-      - name: 🐳 Build Docker Image
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          set -euo pipefail
-
-          # Create the multi-line file
-          cat <<EOF > .npmrc_temp
-          @tria-plc:registry=https://npm.pkg.github.com
-          //npm.pkg.github.com/:_authToken=${NPM_TOKEN}
-          always-auth=true
-          EOF
-
-          # Build using the file
-          docker build --secret id=npmrc,src=.npmrc_temp -t edr-${{needs.environment.outputs.target}} .
-          docker build --secret id=npmrc,src=.npmrc_temp --target passenger-migration -t edr-passenger-migration-${{needs.environment.outputs.target}} .
-
-          # Shred/Remove the sensitive file
-          rm .npmrc_temp
-
-  deploy-service:
-    name: ${{ matrix.display_name }}
-    runs-on: [self-hosted, dev]
-    needs: [build-base-image, environment]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - service: freight-api
-            env_file: .env.freight-api
-            display_name: 🚚 Deploy Freight API Service
-          - service: passenger-api
-            env_file: .env.passenger-api
-            display_name: 🧑‍🦲 Deploy Passenger API Service
-
-    steps:
-      - name: 🔍 Checkout
-        uses: actions/checkout@v4
-
-      - name: 📋 Copy ${{ matrix.service }} Environment
-        run: cp ~/environment/edr/${{needs.environment.outputs.target}}/${{ matrix.env_file }} .env
-
-      - name: 🧪 Run Passenger API migrations
-        if: ${{ matrix.service == 'passenger-api' }}
-        run: |
-          docker run --rm --env-file .env edr-passenger-migration-${{needs.environment.outputs.target}}
-
-      - name: 🚀 Start ${{ matrix.service }} Service
-        run: docker compose --project-name="edr-${{needs.environment.outputs.target}}" up -d --force-recreate ${{ matrix.service }} --build