Merge pull request #91 from LminWoo99/develop

Develop
LminWoo99 · Dec 6, 2023 · dfebde2 · dfebde2
2 parents 2ffb994 + c21f9ec
commit dfebde2
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 77 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
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ec2-user
-          key: ${{ secrets.PRIVATE_KEY }}
-
-          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
+#        uses: appleboy/ssh-action@master
+#        with:
+#          host: ${{ secrets.HOST }}
+#          username: ec2-user
+#          key: ${{ secrets.PRIVATE_KEY }}
+#
+#          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/index.html b/src/main/resources/templates/index.html
@@ -108,7 +108,7 @@
 <div class="limiter">
     <div class="container-login100" style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('/images/login/home_background.png');">
         <div class="title-container">
-            <h2 class="title">모두의 마당-로드밸런싱 테스트</h2>
+            <h2 class="title">모두의 마당-로드밸런싱 테스트 v2</h2>
             <p class="subtitle">모두가 주인인 마당, 여기서 회의 시작해요</p>
         </div>
         <div class="wrap-login100">