Skip to content

Commit 427297c

Browse files
committed
Merge branch 'chore/server-setting-fix' into develop
2 parents 22f9ccb + b768a76 commit 427297c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/deploy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77

88
concurrency:
9-
group: deploy-${{ github.workflow }}-${{ github.ref_name }}
9+
group: deploy-${{github.workflow}}-${{github.ref_name}}
1010
cancel-in-progress: true
1111

1212
permissions:
@@ -82,5 +82,6 @@ jobs:
8282
docker pull ${IMAGE}:${SHA_TAG}
8383
docker tag ${IMAGE}:${SHA_TAG} ${IMAGE}:${ROLLING_TAG}
8484
85-
docker compose up -d --no-deps --force-recreate ${{steps.meta.outputs.service}}
85+
unset COMPOSE_FILE
86+
docker compose -f docker-compose.yml up -d --no-deps --force-recreate ${{steps.meta.outputs.service}}
8687
docker image prune -af --filter "until=168h"

0 commit comments

Comments
 (0)