Merge pull request #84 from LminWoo99/develop

Develop
LminWoo99 · Dec 5, 2023 · 15f84fe · 15f84fe
2 parents e1c197e + 2e48d64
commit 15f84fe
Show file tree

Hide file tree

Showing 2 changed files with 117 additions and 58 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -1,28 +1,28 @@
-name: CD
-
-on:
-  push:
-    branches: [ "master"]
-  pull_request:
-    branches: [ "master" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-
-
+#name: CD
+#
+#on:
+#  push:
+#    branches: [ "master"]
+#  pull_request:
+#    branches: [ "master" ]
+#
+#permissions:
+#  contents: read
+#
+#jobs:
+#  build:
+#
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#
+#
 #      - name: make application-prod.yml
 #        run: |
 #          cd ./src/main/resources
@@ -33,21 +33,21 @@ jobs:
 #          cd ./src/main/resources
 #          touch ./application.yaml
 #          echo "${{ secrets.APPLICATION_PRO }}" > ./application.yaml
-
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Build with Gradle
-        run: ./gradlew build -x test
-
-      - name: Docker build
-        run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker buildx build --push --platform linux/amd64 -t ${{ secrets.DOCKER_USERNAME }}/chat .
-          # docker tag chat ${{ secrets.DOCKER_USERNAME }}/chat
-          docker push ${{ secrets.DOCKER_USERNAME }}/chat
-
+#
+#
+#      - name: Grant execute permission for gradlew
+#        run: chmod +x gradlew
+#
+#      - name: Build with Gradle
+#        run: ./gradlew build -x test
+#
+#      - name: Docker build
+#        run: |
+#          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+#          docker buildx build --push --platform linux/amd64 -t ${{ secrets.DOCKER_USERNAME }}/chat .
+#          # docker tag chat ${{ secrets.DOCKER_USERNAME }}/chat
+#          docker push ${{ secrets.DOCKER_USERNAME }}/chat
+#
 #      - name: Deploy
 #        uses: appleboy/ssh-action@master
 #        with:
@@ -58,23 +58,19 @@ jobs:
 #            docker pull ${{ secrets.DOCKER_USERNAME }}/chat
 #            docker stop $(docker ps -a -q | grep -v $(docker-compose ps -q kurento)) # Kurento 서비스를 제외한 다른 모든 컨테이너 중지
 #            docker rm $(docker ps --filter 'status=exited' -a -q) # 종료된(exited) 상태의 모든 컨테이너 삭제
-#            echo "${{ secrets.APPLICATION_PROD }}" > ./src/main/resources/application.yml
-#            echo "${{ secrets.APPLICATION_PRO }}" > ./src/main/resources/application.yaml
 #            docker-compose up -d
 #            docker image prune -a -f
-
-      - name: Deploy to Instance 2
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.HOST2 }}
-          username: ec2-user
-          key: ${{ secrets.PRIVATE_KEY2 }}
-
-          script: |
-            docker pull ${{ secrets.DOCKER_USERNAME }}/chat
-            docker stop $(docker ps -a -q | grep -v $(docker-compose ps -q kurento)) # Kurento 서비스를 제외한 다른 모든 컨테이너 중지
-            docker rm $(docker ps --filter 'status=exited' -a -q) # 종료된(exited) 상태의 모든 컨테이너 삭제
-            echo "${{ secrets.APPLICATION_PROD2 }}" > ./src/main/resources/application.yml
-            echo "${{ secrets.APPLICATION_PRO }}" > ./src/main/resources/application.yaml
-            docker-compose up -d
-            docker image prune -a -f
+#
+#      - name: Deploy to Instance 2
+#        uses: appleboy/ssh-action@master
+#        with:
+#          host: ${{ secrets.HOST2 }}
+#          username: ec2-user
+#          key: ${{ secrets.PRIVATE_KEY2 }}
+#
+#          script: |
+#            docker pull ${{ secrets.DOCKER_USERNAME }}/chat
+#            docker stop $(docker ps -a -q | grep -v $(docker-compose ps -q kurento)) # Kurento 서비스를 제외한 다른 모든 컨테이너 중지
+#            docker rm $(docker ps --filter 'status=exited' -a -q) # 종료된(exited) 상태의 모든 컨테이너 삭제
+#            docker-compose up -d
+#            docker image prune -a -f
diff --git a/.github/workflows/CD2.yml b/.github/workflows/CD2.yml
@@ -0,0 +1,63 @@
+name: CD2
+
+on:
+  push:
+    branches: [ "master"]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+
+
+      - name: make application-prod.yml
+        run: |
+          cd ./src/main/resources
+          touch ./application.yml
+          echo "${{ secrets.APPLICATION_PROD2 }}" > ./application.yml
+      - name: make application-prod.yaml
+        run: |
+          cd ./src/main/resources
+          touch ./application.yaml
+          echo "${{ secrets.APPLICATION_PRO }}" > ./application.yaml
+
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build -x test
+
+      - name: Docker build
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker buildx build --push --platform linux/amd64 -t ${{ secrets.DOCKER_USERNAME }}/chat .
+          # docker tag chat ${{ secrets.DOCKER_USERNAME }}/chat
+          docker push ${{ secrets.DOCKER_USERNAME }}/chat
+
+      - name: Deploy to Instance 2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST2 }}
+          username: ec2-user
+          key: ${{ secrets.PRIVATE_KEY2 }}
+
+          script: |
+            docker pull ${{ secrets.DOCKER_USERNAME }}/chat
+            docker stop $(docker ps -a -q | grep -v $(docker-compose ps -q kurento)) # Kurento 서비스를 제외한 다른 모든 컨테이너 중지
+            docker rm $(docker ps --filter 'status=exited' -a -q) # 종료된(exited) 상태의 모든 컨테이너 삭제
+            docker-compose up -d
+            docker image prune -a -f