From 37c13ee7e1b1ec0913979640bc2fb55ca5822772 Mon Sep 17 00:00:00 2001
From: SennayT <wsennay@gmail.com>
Date: Thu, 28 May 2026 14:12:32 +0300
Subject: [PATCH] move deployment to dev branch

---
 .github/workflows/deploy.yml         | 31 ++++++++++++++--------------
 apps/edr-passenger-api/Dockerfile    |  1 +
 infrastructure/docker/Dockerfile.web |  1 +
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 87cc8e724..3af25bcf6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,9 +4,8 @@ on:
   push:
     branches:
       - main
-      - develop
+      - dev
       - staging
-      - feat/improve-buid-pipeline
     paths:
       - "apps/edr-freight-api/**"
       - "apps/edr-freight-web/**"
@@ -67,13 +66,13 @@ jobs:
             freight-portal \
             freight-backoffice
 
-      # - name: Deploy containers
-      #   run: |
-      #     set -euo pipefail
-      #     docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \
-      #       freight-api \
-      #       freight-portal \
-      #       freight-backoffice
+      - name: Deploy containers
+        run: |
+          set -euo pipefail
+          docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \
+            freight-api \
+            freight-portal \
+            freight-backoffice
 
       - name: Remove npm credentials from workspace
         if: always()
@@ -120,13 +119,13 @@ jobs:
             passenger-portal \
             passenger-backoffice
 
-      # - name: Deploy containers
-      #   run: |
-      #     set -euo pipefail
-      #     docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \
-      #       passenger-api \
-      #       passenger-portal \
-      #       passenger-backoffice
+      - name: Deploy containers
+        run: |
+          set -euo pipefail
+          docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \
+            passenger-api \
+            passenger-portal \
+            passenger-backoffice
 
       - name: Remove npm credentials from workspace
         if: always()
diff --git a/apps/edr-passenger-api/Dockerfile b/apps/edr-passenger-api/Dockerfile
index 7d6896223..5fd647968 100644
--- a/apps/edr-passenger-api/Dockerfile
+++ b/apps/edr-passenger-api/Dockerfile
@@ -15,6 +15,7 @@ FROM base AS installer
 COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
+    --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile
 
 FROM base AS builder
diff --git a/infrastructure/docker/Dockerfile.web b/infrastructure/docker/Dockerfile.web
index c51aa3aa8..38e863b86 100644
--- a/infrastructure/docker/Dockerfile.web
+++ b/infrastructure/docker/Dockerfile.web
@@ -18,6 +18,7 @@ FROM base AS installer
 COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
+    --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile
 
 FROM base AS builder