[REFACTOR/#51] rest uri naming conventions / application test / firebase 반영

.github/workflows/cd.yml

@@ -11,12 +11,58 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+
+      - name: Create buildx builder
+        run: |
+          docker buildx create --use --name mybuilder
+          docker buildx inspect --bootstrap
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build & Push Dependency Cache
+        run: |
+          docker buildx build \
+          --builder mybuilder \
+          --platform linux/amd64 \
+          --push \
+          --file Dockerfile \
+          --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+          --target dependencies \
+          --cache-to type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache,mode=max \
+          .
+
+      - name: Build & Push Final App Image
+        run: |
+          docker buildx build \
+            --builder mybuilder \
+            --platform linux/amd64 \
+            --push \
+            --file Dockerfile \
+            --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest \
+            --build-arg DEPENDENCY_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+            --cache-from type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+            .
+
       - name: Create application-secret.yml
         run: |
           mkdir -p ./temp_secret
           echo "${{ secrets.APPLICATION_SECRET }}" > ./temp_secret/application-secret.yml
         shell: bash
 
+      - name: Create service-account.json
+        run: |
+          mkdir -p ./temp_secret
+          echo "${{ secrets.SERVICE_ACCOUNT }}" > ./temp_secret/service-account.json
+        shell: bash
+
       - name: Copy application-secret.yml to EC2
         uses: appleboy/[email protected]
         with:
@@ -26,6 +72,15 @@ jobs:
           source: ./temp_secret/application-secret.yml
           target: /home/ubuntu/secret/
 
+      - name: Copy service-account.json to EC2
+        uses: appleboy/[email protected]
+        with:
+          username: ubuntu
+          host: ${{ secrets.EC2_HOST }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ./temp_secret/service-account.json
+          target: /home/ubuntu/secret/
+
       - name: Copy docker-compose.yml
         uses: appleboy/[email protected]
         with:

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ name: CI Pipeline
 on:
   push:
     branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
 
 jobs:
   ci:
@@ -32,44 +34,4 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build and Test
-        run: ./gradlew clean build test
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-
-      - name: Create buildx builder
-        run: |
-          docker buildx create --use --name mybuilder
-          docker buildx inspect --bootstrap
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build & Push Dependency Cache
-        run: |
-          docker buildx build \
-          --builder mybuilder \
-          --platform linux/amd64 \
-          --push \
-          --file Dockerfile \
-          --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-          --target dependencies \
-          --cache-to type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache,mode=max \
-          .
-
-      - name: Build & Push Final App Image
-        run: |
-          docker buildx build \
-            --builder mybuilder \
-            --platform linux/amd64 \
-            --push \
-            --file Dockerfile \
-            --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest \
-            --build-arg DEPENDENCY_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-            --cache-from type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-            .
+        run: ./gradlew clean build test --no-build-cache

.gitignore

@@ -44,8 +44,6 @@ out/
 
 ### Secret ###
 src/main/resources/application-secret.yml
-src/test/resources/application-test.yml
-src/test/resources/application-secret.yml
 
 ### Firebase ###
 src/main/resources/firebase/

docker-compose.yml

@@ -11,7 +11,8 @@ services:
       - SPRING_PROFILES_ACTIVE=blue
       - SPRING_CONFIG_ADDITIONAL_LOCATION=file:/app/config/
     volumes:
-      - /home/ubuntu/app/config/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/service-account.json:/app/config/service-account.json:ro
     networks:
       - assu-network
 
@@ -27,7 +28,8 @@ services:
       - SPRING_PROFILES_ACTIVE=green
       - SPRING_CONFIG_ADDITIONAL_LOCATION=file:/app/config/
     volumes:
-      - /home/ubuntu/app/config/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/service-account.json:/app/config/service-account.json:ro
     networks:
       - assu-network