Merge branch 'master' into dev

ITA-OneByte · Jan 13, 2025 · d58f15a · d58f15a
2 parents d75bfd1 + cf736d1
commit d58f15a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 33 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -13,35 +13,34 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # 1. Java 설정
       - name: Set up JDK 22
         uses: actions/setup-java@v3
         with:
           java-version: '22'
           distribution: 'temurin'
 
-      # 2. Gradle Wrapper에 실행 권한을 부여합니다.
       - name: Grant execute permission for Gradle Wrapper
         run: chmod +x gradlew
 
-      # 3. Spring Boot 애플리케이션 빌드
+      - name: create resources folder if not exists
+        run: mkdir -p src/main/resources
+
+      - name: set up application.properties
+        run: echo "${{ secrets.APPLICATION }}" > src/main/resources/application.properties
+
       - name: Build with Gradle
         uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
         with:
           arguments: clean bootJar
-
-      # 4. Docker 이미지 빌드
       - name: Docker image build
         run: docker build -t ${{ secrets.DOCKER_USERNAME }}/github-actions-demo .
 
-      # 5. DockerHub 로그인
       - name: Docker login
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      # 6. Docker Hub 이미지 푸시
       - name: Docker Hub push
         run: docker push ${{ secrets.DOCKER_USERNAME }}/github-actions-demo
 
@@ -50,24 +49,19 @@ jobs:
     runs-on: self-hosted
 
     steps:
-      # 1. 최신 이미지를 풀받습니다
       - name: Docker pull
-
         run: sudo docker pull ${{ secrets.DOCKER_USERNAME }}/github-actions-demo
 
-      # 2. 기존 컨테이너를 중지 및 삭제
       - name: Stop and remove existing containers
         run: |
-          CONTAINER_IDS=$(sudo docker ps -q)
+          CONTAINER_IDS=$(sudo docker ps -aq)
           if [ -n "$CONTAINER_IDS" ]; then
             sudo docker stop $CONTAINER_IDS
             sudo docker rm $CONTAINER_IDS
           fi
 
-      # 3. 최신 이미지를 컨테이너화하여 실행시킵니다
       - name: Run new container
         run: sudo docker run --name github-actions-demo --rm -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/github-actions-demo
 
-      # 4. 미사용 이미지를 정리합니다
       - name: Clean up old Docker images
         run: sudo docker system prune -f
diff --git a/src/main/java/classfit/example/classfit/common/config/SwaggerController.java b/src/main/java/classfit/example/classfit/common/config/SwaggerController.java
@@ -8,25 +8,24 @@ public class SwaggerController {
     @GetMapping("/swagger-ui/index.html")
     public String swaggerUi() {
         return "<!-- HTML for static distribution bundle build -->\n" +
-            "<!DOCTYPE html>\n" +
-            "<html lang=\"en\">\n" +
-            "  <head>\n" +
-            "    <meta http-equiv=\"Content-Security-Policy\" content=\"upgrade-insecure-requests\" />\n" +
-            "    <meta charset=\"UTF-8\">\n" +
-            "    <title>Swagger UI</title>\n" +
-            "    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://classfit.duckdns.org/swagger-ui/swagger-ui.css\" />\n" +
-            "    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://classfit.duckdns.org/swagger-ui/index.css\" />\n" +
-            "    <link rel=\"icon\" type=\"image/png\" href=\"https://classfit.duckdns.org/swagger-ui/favicon-32x32.png\" sizes=\"32x32\" />\n" +
-            "    <link rel=\"icon\" type=\"image/png\" href=\"https://classfit.duckdns.org/swagger-ui/favicon-16x16.png\" sizes=\"16x16\" />\n" +
-            "  </head>\n" +
-            "\n" +
-            "  <body>\n" +
-            "    <div id=\"swagger-ui\"></div>\n" +
-            "    <script src=\"https://classfit.duckdns.org/swagger-ui/swagger-ui-bundle.js\" charset=\"UTF-8\"> </script>\n" +
-            "    <script src=\"https://classfit.duckdns.org/swagger-ui/swagger-ui-standalone-preset.js\" charset=\"UTF-8\"> </script>\n" +
-            "    <script src=\"https://classfit.duckdns.org/swagger-ui/swagger-initializer.js\" charset=\"UTF-8\"> </script>\n" +
-            "  </body>\n" +
-            "</html>\n";
+                "<!DOCTYPE html>\n" +
+                "<html lang=\"en\">\n" +
+                "  <head>\n" +
+                "    <meta http-equiv=\"Content-Security-Policy\" content=\"upgrade-insecure-requests\" />\n" +
+                "    <meta charset=\"UTF-8\">\n" +
+                "    <title>Swagger UI</title>\n" +
+                "    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://classfit.duckdns.org/swagger-ui/swagger-ui.css\" />\n" +
+                "    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://classfit.duckdns.org/swagger-ui/index.css\" />\n" +
+                "    <link rel=\"icon\" type=\"image/png\" href=\"https://classfit.duckdns.org/swagger-ui/favicon-32x32.png\" sizes=\"32x32\" />\n" +
+                "    <link rel=\"icon\" type=\"image/png\" href=\"https://classfit.duckdns.org/swagger-ui/favicon-16x16.png\" sizes=\"16x16\" />\n" +
+                "  </head>\n" +
+                "\n" +
+                "  <body>\n" +
+                "    <div id=\"swagger-ui\"></div>\n" +
+                "    <script src=\"https://classfit.duckdns.org/swagger-ui/swagger-ui-bundle.js\" charset=\"UTF-8\"> </script>\n" +
+                "    <script src=\"https://classfit.duckdns.org/swagger-ui/swagger-ui-standalone-preset.js\" charset=\"UTF-8\"> </script>\n" +
+                "    <script src=\"https://classfit.duckdns.org/swagger-ui/swagger-initializer.js\" charset=\"UTF-8\"> </script>\n" +
+                "  </body>\n" +
+                "</html>\n";
     }
 }
-