Chore: (main) cd/cd 수정

Survival-From-Epidemic · Nov 4, 2023 · ef593c7 · ef593c7
1 parent a92807d
commit ef593c7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -18,22 +18,25 @@ jobs:
                java-version: '17'
                distribution: 'zulu'
 
-         - name: Build with Gradle
-           run: ./gradlew build -x test
+         - name: Set up .jar
+           run: ./gradlew bootJar
 
-         - name: Deploy For EC2 # EC2 접속
+         - name: Publish to Registry
+           uses: elgohr/Publish-Docker-Github-Action@v5
+           with:
+               name: ${{ secrets.DOCKER_REPOSITORY }}
+               username: ${{ secrets.DOCKER_USERNAME }}
+               password: ${{ secrets.DOCKER_PASSWORD }}
+
+         - name: Deploy For EC2 # EC2 ssh 접속
            uses: appleboy/ssh-action@master
            with:
                host: ${{ secrets.EC2_HOST }}
+               port: ${{ secrets.EC2_SSH_PORT }}
                username: ${{ secrets.EC2_USERNAME }}
                key: ${{ secrets.EC2_SSH_KEY }}
-               port: ${{ secrets.EC2_SSH_PORT }}
                script: |
                      cd sfe
-                     git clone https://github.com/Survival-From-Epidemic/Survival-From-Epidemic-Backend.git
-                     cd Survival-From-Epidemic-Backend/
-                     mkdir -p src/main/resources
-                     echo "${{ secrets.MAIN_APPLICATION }}" | base64 --decode > src/main/resources/application.yml
-                     touch .env
-                     echo "${{ secrets.ENV }}" >> .env
-                     docker-compose up -d
+                     docker pull ${{ secrets.DOCKER_REPOSITORY }}
+                     docker rm -f sfe-server
+                     docker run -dp ${SPRING_HOST_PORT}:${SPRING_CONTAINER_PORT} --name sfe-server --env-file .env ${{ secrets.DOCKER_REPOSITORY }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,8 +31,8 @@ jobs:
          mkdir -p src/test/resources
          echo "${{ secrets.TEST_APPLICATION }}" | base64 --decode > src/test/resources/application.yml
 
-    - name: Build with Gradle
-#      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
-#      with:
-#          arguments: build
-      run: ./gradlew build -x test
+    - name: run test
+      run: ./gradlew test
+
+    - name: run build
+      run: ./gradlew clean build -x test