From 18c3641cf6c07c218c35e3478f898b5bf50d12c2 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:46:48 +0900 Subject: [PATCH 1/7] Update baguni.test.batch.deploy.yml --- .github/workflows/baguni.test.batch.deploy.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/baguni.test.batch.deploy.yml b/.github/workflows/baguni.test.batch.deploy.yml index c361ebefc..e29033ae3 100644 --- a/.github/workflows/baguni.test.batch.deploy.yml +++ b/.github/workflows/baguni.test.batch.deploy.yml @@ -37,7 +37,7 @@ jobs: - name: Build and Deploy ${{ env.module-name }} Module run: | ./backend/gradlew -p backend/${{ env.module-name }} clean build -x test - docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} backend/${{ env.module-name }} + docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} backend/${{ env.module-name }} - # Docker hub 로그인 name: Login to Docker Hub @@ -47,7 +47,7 @@ jobs: password: ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} - # Docker hub 업로드 name: Publish to docker hub - run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} + run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} - name: Deploy on Test-Server uses: appleboy/ssh-action@master @@ -61,10 +61,7 @@ jobs: echo ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} | docker login -u ${{ env.docker-hub-username }} --password-stdin echo "docker - pulling..." - docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} - - echo "docker - changing image name and tag ..." - docker tag ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} ${{ env.docker-hub-repo }}:${{ env.module-name }}-staging + docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} echo "moving to project directory..." cd /home/project/baguni/develop From 98ae0b834a17135507effcc09c179d56289a49c8 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:50:55 +0900 Subject: [PATCH 2/7] Update baguni.test.api.deploy.yml --- .github/workflows/baguni.test.api.deploy.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/baguni.test.api.deploy.yml b/.github/workflows/baguni.test.api.deploy.yml index ed8f63f47..ae402b1db 100644 --- a/.github/workflows/baguni.test.api.deploy.yml +++ b/.github/workflows/baguni.test.api.deploy.yml @@ -37,7 +37,7 @@ jobs: - name: Build and Deploy ${{ env.module-name }} Module run: | ./backend/gradlew -p backend/${{ env.module-name }} clean build -x test - docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} backend/${{ env.module-name }} + docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} backend/${{ env.module-name }} - # Docker hub 로그인 name: Login to Docker Hub @@ -47,7 +47,7 @@ jobs: password: ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} - # Docker hub 업로드 name: Publish to docker hub - run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} + run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} - name: Deploy on Test-Server uses: appleboy/ssh-action@master @@ -61,10 +61,7 @@ jobs: echo ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} | docker login -u ${{ env.docker-hub-username }} --password-stdin echo "docker - pulling..." - docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} - - echo "docker - changing image name and tag ..." - docker tag ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} ${{ env.docker-hub-repo }}:${{ env.module-name }}-staging + docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} echo "moving to project directory..." cd /home/project/baguni/develop From 0cdf8f50c64fe49024eb95be4685aa4df0732dc9 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:51:40 +0900 Subject: [PATCH 3/7] Update baguni.test.ranking.deploy.yml --- .github/workflows/baguni.test.ranking.deploy.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/baguni.test.ranking.deploy.yml b/.github/workflows/baguni.test.ranking.deploy.yml index b4927e021..b8ae1c6ee 100644 --- a/.github/workflows/baguni.test.ranking.deploy.yml +++ b/.github/workflows/baguni.test.ranking.deploy.yml @@ -37,7 +37,7 @@ jobs: - name: Build and Deploy ${{ env.module-name }} Module run: | ./backend/gradlew -p backend/${{ env.module-name }} clean build -x test - docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} backend/${{ env.module-name }} + docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} backend/${{ env.module-name }} - # Docker hub 로그인 name: Login to Docker Hub @@ -47,7 +47,7 @@ jobs: password: ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} - # Docker hub 업로드 name: Publish to docker hub - run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} + run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} - name: Deploy on Test-Server uses: appleboy/ssh-action@master @@ -61,10 +61,7 @@ jobs: echo ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} | docker login -u ${{ env.docker-hub-username }} --password-stdin echo "docker - pulling..." - docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} - - echo "docker - changing image name and tag ..." - docker tag ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} ${{ env.docker-hub-repo }}:${{ env.module-name }}-staging + docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} echo "moving to project directory..." cd /home/project/baguni/develop From bb94cf5418880da2226daaf37f4f836f1f5ad837 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:52:35 +0900 Subject: [PATCH 4/7] Update baguni.test.client.deploy.yml --- .github/workflows/baguni.test.client.deploy.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/baguni.test.client.deploy.yml b/.github/workflows/baguni.test.client.deploy.yml index 37e61bb7e..551edc722 100644 --- a/.github/workflows/baguni.test.client.deploy.yml +++ b/.github/workflows/baguni.test.client.deploy.yml @@ -43,7 +43,7 @@ jobs: - # Docker image 빌드 name: Build docker image run: | - docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} frontend + docker build -t ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} frontend - # Docker hub 로그인 name: Login to Docker Hub uses: docker/login-action@v3 @@ -52,7 +52,7 @@ jobs: password: ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} - # Docker hub 업로드 name: Publish to docker hub - run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} + run: docker push ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} - # 서버 ssh 접속 후 방금 올린 이미지 pull 받고 실행 name: Deploy on Test-Server uses: appleboy/ssh-action@master @@ -67,11 +67,8 @@ jobs: echo ${{ secrets.DOCKERHUB_REPO_BAGUNI_TOKEN }} | docker login -u ${{ env.docker-hub-username }} --password-stdin echo "docker - pulling..." - docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} - - echo "docker - changing image name and tag ..." - docker tag ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }}-${{ github.sha }} ${{ env.docker-hub-repo }}:${{ env.module-name }}-staging - + docker pull ${{ env.docker-hub-username }}/${{ env.docker-hub-repo }}:${{ env.module-name }} + echo "moving to project directory..." cd /home/project/baguni/develop From b181e32f8d3566ea31dae4ffe261ec5a61e0b331 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:54:38 +0900 Subject: [PATCH 5/7] Update baguni.test.api.deploy.yml --- .github/workflows/baguni.test.api.deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/baguni.test.api.deploy.yml b/.github/workflows/baguni.test.api.deploy.yml index ae402b1db..1ac451413 100644 --- a/.github/workflows/baguni.test.api.deploy.yml +++ b/.github/workflows/baguni.test.api.deploy.yml @@ -5,7 +5,8 @@ on: branches: - 'be-develop' # 배포 대상 브랜치 paths: - - 'backend/baguni-core/**' + - 'backend/baguni-common/**' + - 'backend/baguni-domain/**' - 'backend/baguni-api/**' workflow_dispatch: From d9c79f875d04c340cbfb60c2ea80cd09ee1539e5 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:54:54 +0900 Subject: [PATCH 6/7] Update baguni.test.batch.deploy.yml --- .github/workflows/baguni.test.batch.deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/baguni.test.batch.deploy.yml b/.github/workflows/baguni.test.batch.deploy.yml index e29033ae3..cc53d20c8 100644 --- a/.github/workflows/baguni.test.batch.deploy.yml +++ b/.github/workflows/baguni.test.batch.deploy.yml @@ -5,7 +5,8 @@ on: branches: - 'be-develop' # 배포 대상 브랜치 paths: - - 'backend/baguni-core/**' + - 'backend/baguni-common/**' + - 'backend/baguni-domain/**' - 'backend/baguni-batch/**' workflow_dispatch: From 866c5deb61b47f989308000b6a440bdb60cfee54 Mon Sep 17 00:00:00 2001 From: Sangwon Yang Date: Fri, 10 Jan 2025 14:55:08 +0900 Subject: [PATCH 7/7] Update baguni.test.ranking.deploy.yml --- .github/workflows/baguni.test.ranking.deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/baguni.test.ranking.deploy.yml b/.github/workflows/baguni.test.ranking.deploy.yml index b8ae1c6ee..93830cdda 100644 --- a/.github/workflows/baguni.test.ranking.deploy.yml +++ b/.github/workflows/baguni.test.ranking.deploy.yml @@ -5,7 +5,7 @@ on: branches: - 'be-develop' # 배포 대상 브랜치 paths: - - 'backend/baguni-core/**' + - 'backend/baguni-common/**' - 'backend/baguni-ranking/**' workflow_dispatch: