diff --git a/.github/workflows/devWorkflow.yml b/.github/workflows/devWorkflow.yml index 4d97030a4..cc638a1ec 100644 --- a/.github/workflows/devWorkflow.yml +++ b/.github/workflows/devWorkflow.yml @@ -1,4 +1,4 @@ -name: testAndDeploy +name: testAndDeploy_dev on: pull_request: diff --git a/.github/workflows/prodWorkflow.yml b/.github/workflows/prodWorkflow.yml index 73d5201c5..9ad587aa2 100644 --- a/.github/workflows/prodWorkflow.yml +++ b/.github/workflows/prodWorkflow.yml @@ -1,10 +1,9 @@ -name: testAndDeploy +name: testAndDeploy_prod on: pull_request: branches: - release - - main types: - closed @@ -50,7 +49,7 @@ jobs: paths: ${{ github.workspace }}/**/build/reports/jacoco/test/jacocoTestReport.xml token: ${{ secrets.GITHUB_TOKEN }} - - name: Send docker-compose.yml + - name: Send docker-compose-prod.yml uses: appleboy/scp-action@master with: host: ${{ secrets.SSH_HOST }} @@ -59,7 +58,7 @@ jobs: source: ./BE/exceed/docker-compose-prod.yml target: /home/ubuntu/backend-deploy - - name: Send resources-develop-environment + - name: Send resources-prod-environment uses: appleboy/scp-action@master with: host: ${{ secrets.SSH_HOST }} @@ -72,7 +71,7 @@ jobs: run: | echo "${{ secrets.ENV_PROD_VARS }}" > .env.prod - - name: Send env file + - name: Send env.prod file uses: appleboy/scp-action@master with: host: ${{ secrets.SSH_HOST }} @@ -101,9 +100,9 @@ jobs: key: ${{ secrets.SSH_KEY }} script: | cd backend-deploy/BE/exceed - sudo docker-compose down + sudo docker-compose -f docker-compose-prod.yml down sudo docker pull ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-prod:latest - sudo docker-compose up --build -d + sudo docker-compose --env-file .env.prod -f docker-compose-prod.yml up -d sudo docker image prune -a -f