💚 [CI/CD] Actions 스크립트 수정

.github/workflows/gradle.yml

@@ -19,25 +19,31 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Make application.yml
+      - name: 2) Convert to prod config
         run: |
           cd ./src/main/resources
-          touch ./application.yml
-          echo "${{ secrets.APPLICATION_YML }}" > ./application.yml
+          [ -e "application.yml" ] && rm application.yml
+          echo "spring:" > application.yml
+          echo "  profiles:" >> application.yml
+          echo "    active: prod" >> application.yml
 
-  cd:
-    runs-on: ubuntu-latest
-    needs: ci
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: 3) Set prod.yml
+        uses: microsoft/variable-substitution@v1
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          files: ./src/main/resources/application-prod.yml
+        env:
+          spring.datasource.url: ${{ secrets.DB_URL }} 
+          spring.datasource.username: ${{ secrets.DB_USERNAME }} 
+          spring.datasource.password: ${{ secrets.DB_PW }}
+          spring.jwt.secret: ${{ secrets.JWT_SECRET }}
+          spring.jwt.token.access-expiration-time: ${{ secrets.JWT_ACCESS_EXPIRATION_TIME }}
+          spring.jwt.token.refresh-expiration-time: ${{ secrets.JWT_REFRESH_EXPIRATION_TIME }}
+          spring.data.redis.host: ${{ secrets.REDIS_HOST }}
+          spring.data.redis.port: ${{ secrets.REDIS_PORT }}
+
+      - name: 3) Set prod.yml - Debug
+        run: |
+          cat ./src/main/resources/application-prod.yml
 
       - name: Grant execute permission for gradlew and build
         run: |
@@ -60,6 +66,27 @@ jobs:
       - name: Docker Hub push
         run: docker push ${{ secrets.DOCKER_USERNAME }}/sponus-docker
 
+  cd:
+    runs-on: ubuntu-latest
+    needs: ci
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      # DockerHub Login (2)
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       # AWS EC2 Server Connect & Docker command execution
       - name: Deploy
         uses: appleboy/ssh-action@master
@@ -68,16 +95,17 @@ jobs:
           username: ec2-user
           key: ${{ secrets.PRIVATE_KEY }} # pem key
           script: |
-                    sudo docker stop sponus-docker
-                    sudo docker rm sponus-docker
-                    sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/sponus-docker
-                    sudo docker pull ${{ secrets.DOCKER_USERNAME }}/sponus-docker
-
-                    sudo docker stop my-redis
-                    sudo docker rm my-redis
-                    sudo docker rmi redis
-
-                    sudo docker pull redis
-                    sudo docker network create my-network
-                    sudo docker run --name my-redis --network my-network -d redis
-                    sudo docker run -it -d -p 8080:8080 --name sponus-docker -e TZ=Asia/Seoul --network my-network ${{ secrets.DOCKER_USERNAME }}/sponus-docker
+            sudo docker stop sponus-docker
+            sudo docker rm sponus-docker
+            sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/sponus-docker
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/sponus-docker
+
+            sudo docker stop my-redis
+            sudo docker rm my-redis
+            sudo docker rmi redis
+
+            sudo docker pull redis
+            sudo docker network create my-network
+            sudo docker run --name my-redis --network my-network -d redis
+            sudo docker run -e SPRING_PROFILES_ACTIVE=prod -it -d -p 8080:8080 --name sponus-docker -e TZ=Asia/Seoul --network my-network ${{ secrets.DOCKER_USERNAME }}/sponus-docker
+

.gitignore

@@ -1,6 +1,8 @@
 # Created by https://www.toptal.com/developers/gitignore/api/java,gradle
 # Edit at https://www.toptal.com/developers/gitignore?templates=java,gradle
 
+*-local.yml
+
 # Mac os
 *.Ds_Store
 

Dockerfile

@@ -1,4 +1,4 @@
 FROM openjdk:17-jdk
 ARG JAR_FILE=./build/libs/*.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java", "-Dspring.profiles.active=docker", "-jar", "/app.jar"]
+ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-jar", "/app.jar"]

src/main/resources/application-prod.yml

@@ -0,0 +1,29 @@
+server:
+  port: 8080
+
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: ${DB_URL}
+    username: ${DB_USERNAME}
+    password: ${DB_PW}
+
+  jpa:
+    database: postgresql
+    hibernate:
+      ddl-auto: update
+    open-in-view: false
+    show-sql: true
+    generate-ddl: true
+
+  jwt:
+    secret: ${JWT_SECRET}
+    token:
+      access-expiration-time: ${JWT_ACCESS_EXPIRATION_TIME}
+      refresh-expiration-time: ${JWT_REFRESH_EXPIRATION_TIME}
+
+  data:
+    redis:
+      host: ${REDIS_HOST}
+      port: ${REDIS_PORT}
+

src/main/resources/application.yml

@@ -1,28 +1,3 @@
-server:
-  port: 8080
-
 spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://localhost:5432/test
-    username: root
-    password: root
-
-  jpa:
-    database: postgresql
-    hibernate:
-      ddl-auto: update
-    open-in-view: false
-    show-sql: true
-    generate-ddl: true
-
-  jwt:
-    secret: "dkqorhvmekgkwlaksdltlrksdpanjfajrdmausdksehlrpTwlckawk"
-    token:
-      access-expiration-time: 43200
-      refresh-expiration-time: 604800
-
-  data:
-    redis:
-      host: localhost
-      port: 6379
+  profiles:
+    active: local