From ac8818ee29d710a84c1b9958cbb5e7e4614d09f8 Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 20:48:52 +0900 Subject: [PATCH 1/8] =?UTF-8?q?deploy:=20/gradlew=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 94fa33d..92d7030 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,6 +13,9 @@ jobs: - name: Checkout source uses: actions/checkout@v4 + - name: Make Gradle wrapper executable + run: chmod +x ./gradlew + - name: Build JAR run: ./gradlew clean build -x test --no-daemon From 411aa3ec74b8658e733480acf85d3e8321b343a4 Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 20:54:11 +0900 Subject: [PATCH 2/8] =?UTF-8?q?deploy:=20=20SSH=20=EC=97=B0=EA=B2=B0=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=97=90=20DEPLOY=5FKEY=20=EC=A7=81?= =?UTF-8?q?=EC=A0=91=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 92d7030..693dfc6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,10 +34,11 @@ jobs: ssh-keyscan -H "${{ secrets.SERVER_HOST }}" >> ~/.ssh/known_hosts - name: Verify SSH connection - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | - ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} "echo 'SSH connection successful'" + ssh -i <(echo "${{ secrets.DEPLOY_KEY }}" | base64 -d) \ + -o StrictHostKeyChecking=no \ + ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} \ + "echo 'SSH connection successful'" - name: Upload JAR to server env: From 31cabbbf36d55be7fecaf5cc403a471a0faba92c Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 20:57:51 +0900 Subject: [PATCH 3/8] =?UTF-8?q?deploy:=20ssh-agent=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=B4=20env=EC=84=A4=EC=A0=95=EA=B3=BC?= =?UTF-8?q?=20=EC=A0=91=EC=86=8D=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 693dfc6..56d485b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,11 +34,12 @@ jobs: ssh-keyscan -H "${{ secrets.SERVER_HOST }}" >> ~/.ssh/known_hosts - name: Verify SSH connection + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | - ssh -i <(echo "${{ secrets.DEPLOY_KEY }}" | base64 -d) \ - -o StrictHostKeyChecking=no \ - ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} \ - "echo 'SSH connection successful'" + ssh -o StrictHostKeyChecking=no \ + ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} \ + "echo 'SSH connection successful'" - name: Upload JAR to server env: From 6d4b971091b5956189d57b49a5d82a36b6afba10 Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 21:07:52 +0900 Subject: [PATCH 4/8] =?UTF-8?q?deploy:=20Docker=ED=8C=8C=EC=9D=BC=EB=93=A4?= =?UTF-8?q?=20=EA=B0=99=EC=9D=B4=20=EC=97=85=EB=A1=9C=EB=93=9C=ED=95=98?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 56d485b..45b9857 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,6 +8,8 @@ on: jobs: build-and-deploy: runs-on: ubuntu-latest + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock steps: - name: Checkout source @@ -20,8 +22,6 @@ jobs: run: ./gradlew clean build -x test --no-daemon - name: Setup SSH with ssh-agent - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | mkdir -p ~/.ssh ssh-agent -a $SSH_AUTH_SOCK > /dev/null @@ -34,24 +34,21 @@ jobs: ssh-keyscan -H "${{ secrets.SERVER_HOST }}" >> ~/.ssh/known_hosts - name: Verify SSH connection - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | ssh -o StrictHostKeyChecking=no \ ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} \ "echo 'SSH connection successful'" - - name: Upload JAR to server - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock + - name: Upload all deploy files run: | rsync -avz -e "ssh" \ build/libs/*.jar \ - ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ secrets.DEPLOY_PATH }}/app.jar + Dockerfile \ + docker-compose.yml \ + ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ secrets.DEPLOY_PATH }}/ - name: Deploy via Docker Compose env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock DB_PASSWORD: ${{ secrets.DB_PASSWORD }} run: | ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'ENDSSH' From b60d7fcd9eb5f6a61b1ef3ea9961b000cc37fecb Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 21:12:34 +0900 Subject: [PATCH 5/8] =?UTF-8?q?deploy:=20Docker=ED=8C=8C=EC=9D=BC=20app.ja?= =?UTF-8?q?r=20=EC=99=B8=20=EB=8B=A4=EB=A5=B8=20=EB=B9=8C=EB=93=9C=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8?= 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 45b9857..af61c21 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,7 +42,7 @@ jobs: - name: Upload all deploy files run: | rsync -avz -e "ssh" \ - build/libs/*.jar \ + build/libs/app.jar \ Dockerfile \ docker-compose.yml \ ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ secrets.DEPLOY_PATH }}/ From 6c448eee0ca9211a33b98fe63a92e7b0cadd5b9d Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 21:18:33 +0900 Subject: [PATCH 6/8] =?UTF-8?q?deploy:=20=20app.jar=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD=20steps=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index af61c21..90daae9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,6 +21,10 @@ jobs: - name: Build JAR run: ./gradlew clean build -x test --no-daemon + - name: Rename JAR to app.jar + run: | + mv build/libs/*.jar build/libs/app.jar + - name: Setup SSH with ssh-agent run: | mkdir -p ~/.ssh From 442d1a7690e81d333c9329245caceb4d8c5a3250 Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 21:22:24 +0900 Subject: [PATCH 7/8] =?UTF-8?q?deploy:=20.=C3=A3.jar=20=C3=A3=C2=85?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=201=EA=B0=9C=EB=A1=9C=20=EC=B6=94=EC=A0=95?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 90daae9..d872fa2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,8 +22,8 @@ jobs: run: ./gradlew clean build -x test --no-daemon - name: Rename JAR to app.jar - run: | - mv build/libs/*.jar build/libs/app.jar + run: | + cp build/libs/*-SNAPSHOT.jar build/libs/app.jar - name: Setup SSH with ssh-agent run: | From 873fd95c79814e422875c64192d92ab7bacbec79 Mon Sep 17 00:00:00 2001 From: HP657 Date: Wed, 26 Nov 2025 21:32:28 +0900 Subject: [PATCH 8/8] =?UTF-8?q?Docker=ED=8C=8C=EC=9D=BC=20=EC=9E=AC?= =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=ED=99=98=EA=B2=BD=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ea37d8..f7680a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,5 @@ -FROM gradle:8.3-jdk17 AS builder -WORKDIR /app -COPY . . -RUN gradle clean build -x test --no-daemon - FROM eclipse-temurin:17-jre-jammy WORKDIR /app -COPY --from=builder /app/build/libs/*.jar app.jar - +COPY app.jar app.jar EXPOSE 8080 - ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file