move deployment to dev branch

This commit is contained in:
SennayT
2026-05-28 14:12:32 +03:00
parent af5f4cd038
commit 37c13ee7e1
3 changed files with 17 additions and 16 deletions

View File

@@ -4,9 +4,8 @@ on:
push: push:
branches: branches:
- main - main
- develop - dev
- staging - staging
- feat/improve-buid-pipeline
paths: paths:
- "apps/edr-freight-api/**" - "apps/edr-freight-api/**"
- "apps/edr-freight-web/**" - "apps/edr-freight-web/**"
@@ -67,13 +66,13 @@ jobs:
freight-portal \ freight-portal \
freight-backoffice freight-backoffice
# - name: Deploy containers - name: Deploy containers
# run: | run: |
# set -euo pipefail set -euo pipefail
# docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \ docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \
# freight-api \ freight-api \
# freight-portal \ freight-portal \
# freight-backoffice freight-backoffice
- name: Remove npm credentials from workspace - name: Remove npm credentials from workspace
if: always() if: always()
@@ -120,13 +119,13 @@ jobs:
passenger-portal \ passenger-portal \
passenger-backoffice passenger-backoffice
# - name: Deploy containers - name: Deploy containers
# run: | run: |
# set -euo pipefail set -euo pipefail
# docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \ docker compose --project-name "${COMPOSE_PROJECT_NAME}" up -d \
# passenger-api \ passenger-api \
# passenger-portal \ passenger-portal \
# passenger-backoffice passenger-backoffice
- name: Remove npm credentials from workspace - name: Remove npm credentials from workspace
if: always() if: always()

View File

@@ -15,6 +15,7 @@ FROM base AS installer
COPY --from=pruner /app/out/json/ . COPY --from=pruner /app/out/json/ .
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \ RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
--mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile
FROM base AS builder FROM base AS builder

View File

@@ -18,6 +18,7 @@ FROM base AS installer
COPY --from=pruner /app/out/json/ . COPY --from=pruner /app/out/json/ .
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \ RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
--mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile
FROM base AS builder FROM base AS builder