fix: Update cd, cd script (#48)

YAPP-Github · Jul 20, 2024 · 7eabcb4 · 7eabcb4
1 parent cd8f170
commit 7eabcb4
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 35 deletions.
diff --git a/.github/workflows/showpot-dev-cd.yml b/.github/workflows/showpot-dev-cd.yml
@@ -24,24 +24,23 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Copy Secrets
+        uses: microsoft/variable-substitution@v1
+        with:
+          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml'
         env:
-          ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-          SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
-          REGION: ${{ secrets.AWS_REGION }}
-          BUCKET: ${{ secrets.AWS_BUCKET }}
-        run:
-          echo $ACCESS_KEY > ./app/src/main/resources/application-dev.yml
-          echo $SECRET_KEY > ./app/src/main/resources/application-dev.yml
-          echo $REGION > ./app/src/main/resources/application-cloud-dev.yml
-          echo $BUCKET > ./app/src/main/resources/application-cloud-dev.yml
+          token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }}
+          cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
+          cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }}
+          cloud.aws.region: ${{ secrets.AWS_REGION }}
+          cloud.aws.s3.bucket: ${{ secrets.AWS_BUCKET }}
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build
 
       - name: Prepare File for Deployment
         run: |
           mkdir -p deployment/app/build/libs
-          cp Dockerfile docker-compose.yml deployment/
+          cp dockerfile-dev docker-compose-dev.yml deployment/
           cp -r ./app/build/libs deployment/app/build
 
       - name: Get Github Actions IP
@@ -76,9 +75,9 @@ jobs:
           key: ${{ secrets.EC2_DEV_SSH_PRIVATE_KEY }}
           script: |
             cd /home/ec2-user/deployment/
-            docker-compose down
+            docker-compose -f docker-compose-dev.yml down
             docker system prune -f
-            docker-compose up -d --build
+            docker-compose -f docker-compose-dev.yml up -d --build
 
       - name: Remove Github Actions IP from Security Group
         if: always()

diff --git a/.github/workflows/showpot-dev-ci.yml b/.github/workflows/showpot-dev-ci.yml
@@ -24,16 +24,15 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Copy Secrets
+        uses: microsoft/variable-substitution@v1
+        with:
+          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml'
         env:
-          ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-          SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
-          REGION: ${{ secrets.AWS_REGION }}
-          BUCKET: ${{ secrets.AWS_BUCKET }}
-        run:
-          echo $ACCESS_KEY > ./app/src/main/resources/application-dev.yml
-          echo $SECRET_KEY > ./app/src/main/resources/application-dev.yml
-          echo $REGION > ./app/src/main/resources/application-cloud-dev.yml
-          echo $BUCKET > ./app/src/main/resources/application-cloud-dev.yml
+          token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }}
+          cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
+          cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }}
+          cloud.aws.region: ${{ secrets.AWS_REGION }}
+          cloud.aws.s3.bucket: ${{ secrets.AWS_BUCKET }}
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build

diff --git a/.github/workflows/showpot-prod-ci.yml b/.github/workflows/showpot-prod-ci.yml
@@ -24,16 +24,14 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Copy Secrets
+        uses: microsoft/variable-substitution@v1
+        with:
+          files: ./app/src/main/resources/application-cloud-prod.yml
         env:
-          ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-          SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
-          REGION: ${{ secrets.AWS_REGION }}
-          BUCKET: ${{ secrets.AWS_BUCKET }}
-        run:
-          echo $ACCESS_KEY > ./app/src/main/resources/application-prod.yml
-          echo $SECRET_KEY > ./app/src/main/resources/application-prod.yml
-          echo $REGION > ./app/src/main/resources/application-cloud-prod.yml
-          echo $BUCKET > ./app/src/main/resources/application-cloud-prod.yml
+          cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
+          cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }}
+          cloud.aws.region: ${{ secrets.AWS_REGION }}
+          cloud.aws.s3.bucket: ${{ secrets.AWS_BUCKET }}
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build

diff --git a/app/src/main/resources/application-cloud-dev.yml b/app/src/main/resources/application-cloud-dev.yml
@@ -3,7 +3,7 @@ cloud:
     credentials:
       accessKey: ${ACCESS_KEY}
       secretKey: ${SECRET_KEY}
-    region:  ${REGION}
+    region: ${REGION}
     s3:
       bucket: ${BUCKET}
     stack:

diff --git a/app/src/main/resources/application-cloud-prod.yml b/app/src/main/resources/application-cloud-prod.yml
@@ -3,7 +3,7 @@ cloud:
     credentials:
       accessKey: ${ACCESS_KEY}
       secretKey: ${SECRET_KEY}
-    region:  ${REGION}
+    region: ${REGION}
     s3:
       bucket: ${BUCKET}
     stack:

diff --git a/app/src/main/resources/application-dev.yml b/app/src/main/resources/application-dev.yml
@@ -17,4 +17,9 @@ spring:
   data:
     redis:
       host: localhost
-      port: 6379
+      port: 6379
+
+token:
+  secret-key: ${TOKEN_SECRET_KEY}
+  access-token-expiration-seconds: 3600000 # 1hour = 1000(=1s) * 60 * 60
+  refresh-token-expiration-seconds: 1209600000 # 2weeks = 1000(=1s) * 60 * 60 * 24 * 14
diff --git a/docker-compose.yml → docker-compose-dev.yml b/docker-compose.yml → docker-compose-dev.yml
@@ -24,7 +24,7 @@ services:
     image: yapp
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: dockerfile-dev
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgresql:5432/yapp
       SPRING_DATASOURCE_USERNAME: yapp

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -0,0 +1,43 @@
+services:
+  postgresql:
+    container_name: yapp_postgresql
+    image: postgres:14
+    environment:
+      POSTGRES_DB: yapp
+      POSTGRES_USER: yapp
+      POSTGRES_PASSWORD: yapp
+    ports:
+      - '5432:5432'
+    restart: always
+    networks:
+      - app-network
+
+  redis:
+    container_name: yapp_redis
+    image: redis:alpine
+    ports:
+      - '6379:6379'
+    networks:
+      - app-network
+
+  app:
+    image: yapp
+    build:
+      context: .
+      dockerfile: dockerfile-prod
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://postgresql:5432/yapp
+      SPRING_DATASOURCE_USERNAME: yapp
+      SPRING_DATASOURCE_PASSWORD: yapp
+      SPRING_REDIS_HOST: redis
+      SPRING_REDIS_PORT: 6379
+    ports:
+      - '8080:8080'
+    depends_on:
+      - postgresql
+      - redis
+    networks:
+      - app-network
+
+networks:
+  app-network:
diff --git a/Dockerfile → dockerfile-dev b/Dockerfile → dockerfile-dev
@@ -1,4 +1,4 @@
 FROM openjdk:21-jdk-slim
 ARG JAR_FILE_PATH=app/build/libs/*.jar
 COPY ${JAR_FILE_PATH} app.jar
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=dev", "app.jar"]
diff --git a/dockerfile-prod b/dockerfile-prod
@@ -0,0 +1,4 @@
+FROM openjdk:21-jdk-slim
+ARG JAR_FILE_PATH=app/build/libs/*.jar
+COPY ${JAR_FILE_PATH} app.jar
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "app.jar"]