From be941a9cb4fb388f86d4291d1e33338520bfe4ba Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 23 Nov 2023 14:36:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20db=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/baton/secret | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/baton/secret b/backend/baton/secret index 4bc3ee6ab..9a4adb562 160000 --- a/backend/baton/secret +++ b/backend/baton/secret @@ -1 +1 @@ -Subproject commit 4bc3ee6ab23b57666bdcadd2181e3955c4691016 +Subproject commit 9a4adb562b9e9d299f21d6fc8ca457078a8eaf60 From ef63dc45f7947db7407e8d75841ff261866bab18 Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 23 Nov 2023 14:37:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20dev=20cd=20=EC=A3=BC=EC=84=9D?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-be-ci-cd-push.yml | 124 ++++++++++++------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/dev-be-ci-cd-push.yml b/.github/workflows/dev-be-ci-cd-push.yml index 62a461ff1..18c1a6403 100644 --- a/.github/workflows/dev-be-ci-cd-push.yml +++ b/.github/workflows/dev-be-ci-cd-push.yml @@ -1,62 +1,62 @@ -name: dev/BE CD on Push - -on: - push: - branches: [ "dev/BE" ] - -jobs: - build: - runs-on: ubuntu-22.04 - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - token: ${{ secrets.SUBMODULE_BE_TOKEN }} - submodules: recursive - - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'corretto' - - - name: Build with Gradle - uses: gradle/gradle-build-action@v2.6.0 - - name: Execute Gradle build - run: | - cd backend/baton - ./gradlew build - - - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2.9.1 - - - name: Login to Docker Hub - uses: docker/login-action@v2.2.0 - with: - username: ${{ secrets.DOCKERHUB_DEV_USERNAME }} - password: ${{ secrets.DOCKERHUB_DEV_TOKEN }} - - - name: Docker Image Build - run: | - cd backend/baton - docker build --platform linux/arm64/v8 -t 2023baton/2023baton -f Dockerfile-dev . - - - name: Docker Hub Push - run: docker push 2023baton/2023baton - - deploy: - runs-on: [ self-hosted, Linux, ARM64, dev ] - needs: build - - steps: - - - name: Pull Latest Docker Image - run: | - sudo docker login --username ${{ secrets.DOCKERHUB_DEV_USERNAME }} --password ${{ secrets.DOCKERHUB_DEV_TOKEN }} - sudo docker pull 2023baton/2023baton:latest - - - name: Docker Compose - run: | - /home/ubuntu/zero-downtime-deploy.sh - sudo docker image prune -af +# name: dev/BE CD on Push +# +# on: +# push: +# branches: [ "dev/BE" ] +# +# jobs: +# build: +# runs-on: ubuntu-22.04 +# +# steps: +# - name: Checkout repository +# uses: actions/checkout@v3 +# with: +# token: ${{ secrets.SUBMODULE_BE_TOKEN }} +# submodules: recursive +# +# - name: Set up JDK 17 +# uses: actions/setup-java@v3 +# with: +# java-version: '17' +# distribution: 'corretto' +# +# - name: Build with Gradle +# uses: gradle/gradle-build-action@v2.6.0 +# - name: Execute Gradle build +# run: | +# cd backend/baton +# ./gradlew build +# +# - name: Setup Docker buildx +# uses: docker/setup-buildx-action@v2.9.1 +# +# - name: Login to Docker Hub +# uses: docker/login-action@v2.2.0 +# with: +# username: ${{ secrets.DOCKERHUB_DEV_USERNAME }} +# password: ${{ secrets.DOCKERHUB_DEV_TOKEN }} +# +# - name: Docker Image Build +# run: | +# cd backend/baton +# docker build --platform linux/arm64/v8 -t 2023baton/2023baton -f Dockerfile-dev . +# +# - name: Docker Hub Push +# run: docker push 2023baton/2023baton +# +# deploy: +# runs-on: [ self-hosted, Linux, ARM64, dev ] +# needs: build +# +# steps: +# +# - name: Pull Latest Docker Image +# run: | +# sudo docker login --username ${{ secrets.DOCKERHUB_DEV_USERNAME }} --password ${{ secrets.DOCKERHUB_DEV_TOKEN }} +# sudo docker pull 2023baton/2023baton:latest +# +# - name: Docker Compose +# run: | +# /home/ubuntu/zero-downtime-deploy.sh +# sudo docker image prune -af