From 4381a9cc28d788394369e2720d3c3084ee1fa71c Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 12:53:56 +0900 Subject: [PATCH 01/16] =?UTF-8?q?ci:=20deploy=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=EC=9D=84=20=EA=B5=AC=EC=84=B1?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 91 ++++++++++++++++++++++++++++++++++++ Dockerfile | 23 +++++++++ 2 files changed, 114 insertions(+) create mode 100644 .github/workflows/deploy.yml create mode 100644 Dockerfile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..9021587 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,91 @@ +name: πŸŽ‡ Deployer + +on: + push: + branches: + - 'release' + pull_request: # ν…ŒμŠ€νŠΈμš©. 잘 λ˜λŠ”κ±° 확인 ν›„ μ‚­μ œ + branches: + - 'main' + +jobs: + build: + name: build and set image + runs-on: ubuntu-latest + strategy: + matrix: + kotlin-version: [ 1.9.22 ] + java-version: [ 21 ] + steps: + - name: checkout code + uses: actions/checkout@v3 + with: + submodules: true + + - name: Set up JDK 21 and Kotlin 1.9.22 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: ${{ matrix.java-version }} + kotlin-version: ${{ matrix.kotlin-version }} + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + + - name: build server + run: ./gradlew build + + - name: move jar file to deploy api + run: mv ./build/libs/*.jar ./deploy/api/ + + - name: docker arm64 build set up - qemu + uses: docker/setup-qemu-action@v2 + + - name: docker arm64 build set up - buildx + uses: docker/setup-buildx-action@v2 + + - name: login github container registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GHCR_TOKEN }} + + - name: extract version + run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" + id: extract_version_name + + - name: build and push api server + uses: docker/build-push-action@v4 + with: + context: . + platforms: linux/arm64/v8 + push: true + tags: | + ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} + build-args: | + "DB_URL=${{ secrets.DB_URL }}" + "DB_USERNAME=${{ secrets.DB_USERNAME }}" + "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" + "REDIS_HOST=${{ secrets.REDIS_HOST }}" + "REDIS_PORT=${{ secrets.REDIS_PORT }}" + + deploy: + needs: build + name: deploy + runs-on: self-hosted + steps: + - name: extract version + run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" + id: extract_version_name + + - name: run api server + run: | + sudo docker pull ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} + sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm + sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a1a1b50 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM arm64v8/openjdk:21 + +ARG DB_URL +ARG DB_USERNAME +ARG DB_PASSWORD +ARG REDIS_HOST +ARG REDIS_PORT + +ARG JAR_FILE=./*.jar +COPY ${JAR_FILE} misik-api.jar + +ENV db_url=${DB_URL} \ + db_username=${DB_USERNAME} \ + db_password=${DB_PASSWORD} \ + redis_host=${REDIS_HOST} \ + redis_port=${REDIS_PORT} + +ENTRYPOINT java -jar misik-api.jar \ + --spring.datasource.url=${db_url} \ + --spring.datasource.username=${db_username} \ + --spring.datasource.password=${db_password} \ + --netx.host=${redis_host} \ + --netx.port=${redis_port} From 3e080e7f27cbb4b87709729d9c6277898889c6da Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 12:59:46 +0900 Subject: [PATCH 02/16] =?UTF-8?q?fix:=20=ED=95=84=EC=9A=94=EC=97=86?= =?UTF-8?q?=EB=8A=94=20move=20jar=20step=EC=9D=84=20=EC=A0=9C=EA=B1=B0?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9021587..c758b52 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,9 +39,6 @@ jobs: - name: build server run: ./gradlew build - - name: move jar file to deploy api - run: mv ./build/libs/*.jar ./deploy/api/ - - name: docker arm64 build set up - qemu uses: docker/setup-qemu-action@v2 From a083377727f430e1df4e212ebd71001a593b8000 Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:00:45 +0900 Subject: [PATCH 03/16] =?UTF-8?q?fix:=20Dockerfile=EC=9D=98=20JAR=5FFILE?= =?UTF-8?q?=20=EC=B0=BE=EB=8A=94=20=EC=9C=84=EC=B9=98=EB=A5=BC=20build?= =?UTF-8?q?=ED=95=98=EC=9C=84=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=9C?= =?UTF-8?q?=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a1a1b50..f03569c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG DB_PASSWORD ARG REDIS_HOST ARG REDIS_PORT -ARG JAR_FILE=./*.jar +ARG JAR_FILE=./build/libs/*.jar COPY ${JAR_FILE} misik-api.jar ENV db_url=${DB_URL} \ From f452449c52e13414017431ff785a877408baca93 Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:03:42 +0900 Subject: [PATCH 04/16] =?UTF-8?q?test:=20=EB=A1=A4=EB=B0=B1!=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EB=B2=84=EC=A0=80=EB=8B=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c758b52..68bc2f2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/arm64/v8 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} + ghcr.io/nexters/misikapi/misikapi:test build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -82,7 +82,7 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} + sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:test From 8d2eb962f7af52635005a9c831a9ccf264dcbcce Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:07:48 +0900 Subject: [PATCH 05/16] =?UTF-8?q?ci:=20Dockerfile=20version=EC=9D=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f03569c..570a72c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/openjdk:21 +FROM openjdk:21-jdk ARG DB_URL ARG DB_USERNAME From 58a87e643f96f54a0eab5d6f57102319978f886c Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:08:17 +0900 Subject: [PATCH 06/16] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EB=B2=84=EC=A0=80=EB=8B=9D=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=EB=A6=AC=EB=B2=84=ED=8A=B8=ED=95=98?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 68bc2f2..cebd930 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/arm64/v8 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test + ghcr.io/nexters/misikapi/misikapi:test2 build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -82,7 +82,7 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test2 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:test + sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:test2 From 5d02a8cd699bb944277c086ba4454c28f8983171 Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:14:02 +0900 Subject: [PATCH 07/16] =?UTF-8?q?fix:=20=EC=84=9C=EB=B2=84=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=ED=94=8C=EB=9E=AB=ED=8F=BC=EC=9D=84=20linux/amd64?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cebd930..2dccae5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -60,7 +60,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - platforms: linux/arm64/v8 + platforms: linux/amd64 push: true tags: | ghcr.io/nexters/misikapi/misikapi:test2 From 827f8b0c4bf6620a31df45751ba62fa560193662 Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:14:17 +0900 Subject: [PATCH 08/16] =?UTF-8?q?fix:=20=EB=A6=AC=EB=B2=84=ED=8A=B8=20test?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2dccae5..7240c6c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test2 + ghcr.io/nexters/misikapi/misikapi:test3 build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -82,7 +82,7 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test2 + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test3 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:test2 + sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 From fcfcfdcd7aff951afef4f50bf01960d31923882b Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:16:49 +0900 Subject: [PATCH 09/16] =?UTF-8?q?refactor:=20network=EB=A5=BC=20docker-com?= =?UTF-8?q?pose..=EB=A1=9C=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7240c6c..358983e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -84,5 +84,5 @@ jobs: run: | sudo docker pull ghcr.io/nexters/misikapi/misikapi:test3 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 + sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 From e0edcfbf1f25a324ff28516f2e301462b6a20d48 Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:19:54 +0900 Subject: [PATCH 10/16] =?UTF-8?q?refactor:=20CLOVA=5FAUTHORIZATION=20?= =?UTF-8?q?=EC=8B=9C=ED=81=AC=EB=A6=BF=EC=9D=84=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 358983e..cb85860 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -70,6 +70,7 @@ jobs: "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" "REDIS_HOST=${{ secrets.REDIS_HOST }}" "REDIS_PORT=${{ secrets.REDIS_PORT }}" + "CLOVA_AUTHORIZATION=${{ secrets.CLOVA_AUTHORIZATION }}" deploy: needs: build @@ -85,4 +86,3 @@ jobs: sudo docker pull ghcr.io/nexters/misikapi/misikapi:test3 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 - diff --git a/Dockerfile b/Dockerfile index 570a72c..b8025e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ ARG DB_USERNAME ARG DB_PASSWORD ARG REDIS_HOST ARG REDIS_PORT +ARG CLOVA_AUTHORIZATION ARG JAR_FILE=./build/libs/*.jar COPY ${JAR_FILE} misik-api.jar @@ -13,11 +14,13 @@ ENV db_url=${DB_URL} \ db_username=${DB_USERNAME} \ db_password=${DB_PASSWORD} \ redis_host=${REDIS_HOST} \ - redis_port=${REDIS_PORT} + redis_port=${REDIS_PORT} \ + clova_authorization=${CLOVA_AUTHORIZATION} ENTRYPOINT java -jar misik-api.jar \ --spring.datasource.url=${db_url} \ --spring.datasource.username=${db_username} \ --spring.datasource.password=${db_password} \ --netx.host=${redis_host} \ - --netx.port=${redis_port} + --netx.port=${redis_port} \ + --me.misik.chatbot.clova.authorization=${clova_authorization} From fa07429925d3b10a0162167a2292a88ba81f3d8c Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:20:15 +0900 Subject: [PATCH 11/16] =?UTF-8?q?test:=20=EB=A6=AC=EB=B2=84=ED=8A=B8=20tes?= =?UTF-8?q?t4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cb85860..510aa0a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test3 + ghcr.io/nexters/misikapi/misikapi:test4 build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -83,6 +83,6 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test3 + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test4 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 + sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test4 From 5a2d8c08e61eff133f8c830bb6e0a33aa300b5ee Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:22:41 +0900 Subject: [PATCH 12/16] =?UTF-8?q?Revert=20"test:=20=EB=A6=AC=EB=B2=84?= =?UTF-8?q?=ED=8A=B8=20test4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fa07429925d3b10a0162167a2292a88ba81f3d8c. --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 510aa0a..cb85860 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test4 + ghcr.io/nexters/misikapi/misikapi:test3 build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -83,6 +83,6 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test4 + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test3 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test4 + sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 From ab2ccdc746128e906380d617a6a9593926d9514f Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:23:26 +0900 Subject: [PATCH 13/16] =?UTF-8?q?Revert=20"fix:=20=EB=A6=AC=EB=B2=84?= =?UTF-8?q?=ED=8A=B8=20test3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 827f8b0c4bf6620a31df45751ba62fa560193662. --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cb85860..42d782c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test3 + ghcr.io/nexters/misikapi/misikapi:test2 build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -83,6 +83,6 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test3 + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test2 sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test3 + sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test2 From 048a92ceab9198bd59377dd4e280f660643f320c Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:24:10 +0900 Subject: [PATCH 14/16] =?UTF-8?q?Revert=20"test:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EB=B2=84=EC=A0=80?= =?UTF-8?q?=EB=8B=9D=20=EC=A0=9C=EA=B1=B0=20=EB=A6=AC=EB=B2=84=ED=8A=B8?= =?UTF-8?q?=ED=95=98=EA=B8=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 58a87e643f96f54a0eab5d6f57102319978f886c. --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 42d782c..22f18f4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test2 + ghcr.io/nexters/misikapi/misikapi:test build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -83,6 +83,6 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test2 + sudo docker pull ghcr.io/nexters/misikapi/misikapi:test sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test2 + sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test From 3ee7a9dcea7869e445f3a3dfc186a838a7b0e03a Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:24:53 +0900 Subject: [PATCH 15/16] =?UTF-8?q?Revert=20"test:=20=EB=A1=A4=EB=B0=B1!=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B2=84=EC=A0=80=EB=8B=9D=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f452449c52e13414017431ff785a877408baca93. --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 22f18f4..95a2e4b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: platforms: linux/amd64 push: true tags: | - ghcr.io/nexters/misikapi/misikapi:test + ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} build-args: | "DB_URL=${{ secrets.DB_URL }}" "DB_USERNAME=${{ secrets.DB_USERNAME }}" @@ -83,6 +83,6 @@ jobs: - name: run api server run: | - sudo docker pull ghcr.io/nexters/misikapi/misikapi:test + sudo docker pull ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} sudo docker ps -q --filter "expose=8080" | xargs sudo docker stop | xargs sudo docker rm - sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:test + sudo docker run -d -p 8080:8080 --network docker-compose_misik_api_network ghcr.io/nexters/misikapi/misikapi:${{ steps.extract_version_name.outputs.version }} From a85733b0bfe89fcb8e74c8fc82e8ecee6b7d6a5f Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 29 Jan 2025 13:25:24 +0900 Subject: [PATCH 16/16] =?UTF-8?q?cd:=20Deployer=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=9A=A9=20trigger=20=EC=A1=B0=EA=B1=B4=EC=9D=84=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 95a2e4b..84e561d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,9 +4,6 @@ on: push: branches: - 'release' - pull_request: # ν…ŒμŠ€νŠΈμš©. 잘 λ˜λŠ”κ±° 확인 ν›„ μ‚­μ œ - branches: - - 'main' jobs: build: