Merge pull request #87 from LminWoo99/develop

Develop
LminWoo99 · Dec 6, 2023 · a91a144 · a91a144
2 parents 15f84fe + 32edfc9
commit a91a144
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 80 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -1,76 +1,76 @@
-#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
-#          touch ./application.yml
-#          echo "${{ secrets.APPLICATION_PROD }}" > ./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
-#        uses: appleboy/ssh-action@master
-#        with:
-#          host: ${{ secrets.HOST }}
-#          username: ec2-user
-#          key: ${{ secrets.PRIVATE_KEY }} # pem 키
-#          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
-#
-#      - 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
+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
+          touch ./application.yml
+          echo "${{ secrets.APPLICATION_PROD }}" > ./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
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ec2-user
+          key: ${{ secrets.PRIVATE_KEY }} # pem 키
+          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
+
+      - 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/src/main/resources/templates/roomlist.html b/src/main/resources/templates/roomlist.html
@@ -141,10 +141,10 @@
                 if($("#maxUserCnt").val() <= 1){
                     alert("채팅은 최소 2명 이상!!");
                     return false;
-                }else if ($("#maxUserCnt").val() > 100) {
-                    alert("100명 이상은 서버가 못 버텨요ㅠ.ㅠ");
-                    return false;
-                }
+                // }else if ($("#maxUserCnt").val() > 100) {
+                //     alert("100명 이상은 서버가 못 버텨요ㅠ.ㅠ");
+                //     return false;
+                // }
             }
 
             // 채팅 타입 필수