cicd : edit workflow

MealTokTok · Jul 24, 2024 · a973b5b · a973b5b
1 parent aeebff0
commit a973b5b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -3,7 +3,6 @@ name: Build And Deploy with Docker
 on:
   push:
     paths-ignore:
-      - '.github/workflows/**'
       - 'README.md'
     branches: [ develop ]
 
@@ -19,13 +18,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2 # git 레파지토리를 클론하는것과 같음
-
-      - name: Gradle에 실행 권한 부여
-        run: chmod +x gradlew
-
-      - name: gradle 빌드
-        run: ./gradlew build -x test
+        uses: actions/checkout@v4 # git 레파지토리를 클론하는것과 같음
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
 
       - name: Setup docker buildx
         id: buildx
@@ -45,11 +42,19 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_TOKEN }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
 
+      - name: Verify JAR File
+        run: ls -l application/app-api/build/libs/
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           file: ./application/app-api/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}

diff --git a/application/app-api/Dockerfile b/application/app-api/Dockerfile
@@ -1,6 +1,7 @@
 FROM eclipse-temurin:17-jdk-alpine
 
 # 빌드 컨텍스트의 경로를 맞추어 COPY 명령을 사용
-COPY application/app-api/build/libs/app-api-0.0.1.jar mealtoktok.jar
+RUN ls -l ./application/app-api/build/libs
+COPY ./application/app-api/build/libs/app-api-0.0.1.jar mealtoktok.jar
 
 ENTRYPOINT ["java", "-jar", "mealtoktok.jar"]
diff --git a/application/app-api/src/main/java/core/startup/mealtoktok/api/global/util/HttpUtils.java b/application/app-api/src/main/java/core/startup/mealtoktok/api/global/util/HttpUtils.java
@@ -6,7 +6,6 @@
 
 public class HttpUtils {
 
-
     public static HttpHeaders setHeaders(JwtTokens jwtTokens) {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.add(SecurityProperties.ACCESS_TOKEN_HEADER, jwtTokens.accessToken());