Merge pull request #11 from 9roomMoa/release/#10

Release/#10

Author: EveryPine

.github/workflows/gradle.yml

@@ -2,9 +2,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release/#*" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release/#*" ]
 
 permissions:
   contents: read
@@ -13,54 +13,86 @@ jobs:
   build-docker-image:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    # 1. Java 21 세팅
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-    
-    # 2. SpringBoot 애플리케이션 빌드
-    - name: Build with Gradle
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        arguments: clean bootJar
+      - uses: actions/checkout@v3
+      # 1. Java 21 세팅
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
 
-    # 3. Docker 이미지 빌드
-    - name: Docker Image Build
-      run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring .
+        # 2. application-oauth/cloud.properties 생성
+      - name: Create application-oauth.properties
+        run: |
+          echo "spring.security.user.name=${{ secrets.SECURITY_USERNAME }}" > ./src/main/resources/application-oauth.properties
+          echo "spring.security.user.password=${{ secrets.SECURITY_PASSWORD }}" >> ./src/main/resources/application-oauth.properties
+          echo "jwt.key=${{ secrets.JWT_KEY }}" >> ./src/main/resources/application-oauth.properties
+          echo "spring.security.oauth2.client.registration.google.client-id=${{ secrets.GOOGLE_CLIENT_ID }}" >> ./src/main/resources/application-oauth.properties
+          echo "spring.security.oauth2.client.registration.google.client-secret=${{ secrets.GOOGLE_CLIENT_SECRET }}" >> ./src/main/resources/application-oauth.properties
+          echo "spring.security.oauth2.client.registration.google.scope=${{ secrets.GOOGLE_SCOPE }}" >> ./src/main/resources/application-oauth.properties
+          echo "spring.security.oauth2.client.registration.google.redirect-uri=${{ secrets.GOOGLE_REDIRECT_URI }}" >> ./src/main/resources/application-oauth.properties
 
-    # 4. DockerHub 로그인
-    - name: DockerHub Login
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Create application-cloud properties
+        run: |
+          echo "spring.datasource.driver-class-name=${{ secrets.DATASOURCE_DRIVER_CLASSNAME }}" > ./src/main/resources/application-cloud.properties
+          echo "spring.datasource.url=${{ secrets.DATASOURCE_URL }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.datasource.username=${{ secrets.DATASOURCE_USERNAME }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.datasource.password=${{ secrets.DATASOURCE_PASSWORD }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.redis.host=${{ secrets.REDIS_HOST }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.redis.port=${{ secrets.REDIS_PORT }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.h2.console.enabled=${{ secrets.H2CONSOLE_ENABLED }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.h2.console.path=${{ secrets.H2CONSOLE_PATH }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.mongodb.host=${{ secrets.MONGODB_HOST }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.mongodb.port=${{ secrets.MONGODB_PORT }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.mongodb.database=${{ secrets.MONGODB_DATABASE }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.mongodb.username=${{ secrets.MONGODB_USERNAME }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.mongodb.password=${{ secrets.MONGODB_PASSWORD }}" >> ./src/main/resources/application-cloud.properties
+          echo "spring.data.mongodb.authentication-database=${{ secrets.MONGODB_AUTHENTICATION_DATABASE }}" >> ./src/main/resources/application-cloud.properties
 
-    # 5. DockerHub 이미지 push
-    - name: DockerHub push
-      run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring
+        # 3. SpringBoot 애플리케이션 빌드
+      - name: Build with Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          arguments: clean bootJar
+
+      # 4. Docker 이미지 빌드
+      - name: Docker Image Build
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring .
+
+      # 5. DockerHub 로그인
+      - name: DockerHub Login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      # 6. DockerHub 이미지 push
+      - name: DockerHub push
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring
 
   run-docker-image-on-ec2:
-    # build-docker-image (위)과정이 완료되어야 실행됨
     needs: build-docker-image
     runs-on: self-hosted
 
     steps:
       # 1. 최신 이미지를 pull 받음
       - name: Docker pull
         run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring
-      
-      # 2. 기존 컨테이너 중지
-      - name: Docker stop Container
-        run: sudo docker stop $(sudo docker ps -q) 2>/dev/null || true
 
-      # 3. 최신 이미지를 컨테이너화하여 실행
-      - name: Docker run new Container
-        run: sudo docker run --name aether_back_spring --rm -d -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring
+      # 2. 기존 컨테이너 중지 및 삭제
+      - name: Stop and Remove Existing Container
+        run: |
+          sudo docker stop aether_back_spring 2>/dev/null || true
+          sudo docker rm aether_back_spring 2>/dev/null || true
+
+      # 3. 최신 이미지를 컨테이너화하여 실행 (80 포트에서 실행)
+      - name: Run New Container (Port 80)
+        run: |
+          sudo docker run --name aether_back_spring --rm -d \
+          -p 80:8080 \
+          --network host \
+          ${{ secrets.DOCKERHUB_USERNAME }}/aether_back_spring
 
       # 4. 미사용 이미지 정리
       - name: Delete old Docker Image
         run: sudo docker system prune -f
-    

.gitignore

@@ -192,3 +192,9 @@ gradle-app.setting
 ### Gradle Patch ###
 # Java heap dump
 *.hprof
+
+# 스프링 oauth 보안 설정 제외
+application-oauth.properties
+
+# DB 관련 설정 제외
+application-cloud.properties

.idea/.gitignore

@@ -0,0 +1,34 @@
+# Getting Started
+
+### Reference Documentation
+For further reference, please consider the following sections:
+
+* [Official Gradle documentation](https://docs.gradle.org)
+* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.1/gradle-plugin)
+* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.1/gradle-plugin/packaging-oci-image.html)
+* [Spring Web](https://docs.spring.io/spring-boot/3.4.1/reference/web/servlet.html)
+* [Spring Boot DevTools](https://docs.spring.io/spring-boot/3.4.1/reference/using/devtools.html)
+* [Spring Data JPA](https://docs.spring.io/spring-boot/3.4.1/reference/data/sql.html#data.sql.jpa-and-spring-data)
+* [Thymeleaf](https://docs.spring.io/spring-boot/3.4.1/reference/web/servlet.html#web.servlet.spring-mvc.template-engines)
+* [Validation](https://docs.spring.io/spring-boot/3.4.1/reference/io/validation.html)
+* [Spring Security](https://docs.spring.io/spring-boot/3.4.1/reference/web/spring-security.html)
+* [OAuth2 Client](https://docs.spring.io/spring-boot/3.4.1/reference/web/spring-security.html#web.security.oauth2.client)
+
+### Guides
+The following guides illustrate how to use some features concretely:
+
+* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
+* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
+* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/)
+* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/)
+* [Handling Form Submission](https://spring.io/guides/gs/handling-form-submission/)
+* [Validation](https://spring.io/guides/gs/validating-form-input/)
+* [Securing a Web Application](https://spring.io/guides/gs/securing-web/)
+* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/)
+* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/)
+
+### Additional Links
+These additional references should also help you:
+
+* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle)
+