MERGE :: SSL WORKING CONFIRMED

Apply SSL (REAL FINAL)
teamMinari · Oct 1, 2024 · d228fae · d228fae
2 parents 953a979 + a1afd85
commit d228fae
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 38 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -29,11 +29,19 @@ jobs:
         jwt.secret: ${{ secrets.JWT_SECRET }}
         spring.ai.openai.api-key: ${{ secrets.OPENAI_API_KEY }}
 
-    - name: set chmod
-      run: chmod +x ./gradlew
+    - name: set ssl yml file
+      uses: microsoft/variable-substitution@v1
+      with:
+        files: src/main/resources/application-ssl.yml
+      env:
+        server.ssl.key-store-password: ${{ secrets.SSL_PASSWORD }}
 
     - name: Build with Gradle
-      run: ./gradlew bootJar
+      run: |
+        echo '${{ secrets.CHEONGFORDO_P12 }}' | base64 --decode > ./src/main/resources/cheongfordo.p12
+        
+        chmod +x ./gradlew
+        ./gradlew bootJar
 
     - name: Docker build & push to prod
       run: |
@@ -54,4 +62,4 @@ jobs:
           docker rm cheong_for_do
           docker rmi ${{ secrets.DOCKER_USERNAME }}/cheong_for_do:latest
           docker pull ${{ secrets.DOCKER_USERNAME }}/cheong_for_do:latest
-          docker run -d -p 8080:8080 --name cheong_for_do ${{ secrets.DOCKER_USERNAME }}/cheong_for_do:latest
+          docker run -d -p 443:8080 --name cheong_for_do ${{ secrets.DOCKER_USERNAME }}/cheong_for_do:latest
diff --git a/.gitignore b/.gitignore
@@ -142,4 +142,6 @@ replay_pid*
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij,java
 
-.gradle/
+.gradle/
+build/
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/Dockerfile b/Dockerfile
@@ -2,4 +2,4 @@ FROM openjdk:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 ENV TZ=Asia/Seoul
-ENTRYPOINT ["java","-jar","/app.jar","-Duser.timezone=Asia/Seoul"]
+ENTRYPOINT ["java","-jar","/app.jar","-Duser.timezone=Asia/Seoul","--spring.config.location=classpath:/application.yml,classpath:/application-ssl.yml"]
diff --git a/src/main/java/Minari/cheongForDo/domain/member/presentation/controller/JwtController.java b/src/main/java/Minari/cheongForDo/domain/member/presentation/controller/JwtController.java
diff --git a/src/main/java/Minari/cheongForDo/domain/member/service/ProfileService.java b/src/main/java/Minari/cheongForDo/domain/member/service/ProfileService.java
diff --git a/src/main/resources/application-ssl.yml b/src/main/resources/application-ssl.yml
@@ -0,0 +1,6 @@
+server: # additional ssl settings
+  ssl:
+    enabled: true
+    key-store-type: PKCS12
+    key-store: classpath:cheongfordo.p12
+    key-store-password: ${SSL_PASSWORD}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -28,7 +28,7 @@ jwt:
     refresh: 604800000
 
 server:
-  port: 443
+  port: 8080
 
 logging:
   level: