Merge branch 'main' of https://github.com/DMU-NextLevel/back

merge

Author: kwonhee1

.github/workflows/gradle.yml

@@ -71,55 +71,6 @@ jobs:
         platforms: linux/amd64,linux/arm64,linux/aarch64
         tags: ${{ secrets.DOCKERHUB_USERNAME }}/nextlevel-nginx:latest
       # run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nextlevel-nginx -f nginx/Dockerfile .
-      
-  # ssh_aws:
-  #   needs: build
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #    - uses: actions/checkout@v4
-
-  #    - name: make docker-compose file
-  #      env:
-  #        PROJECT_DIR: /home/${{ secrets.SERVER_USERNAME }}
-  #        MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
-  #      run: |
-  #        envsubst < docker-compose.tpl.yml > docker-compose.yml
-
-  #    - name: make nginx file
-  #      env:
-  #        SERVER_DOMAIN: ${{ secrets.SERVER_HOST }}
-  #      run: |
-  #        envsubst '${SERVER_DOMAIN}' < nginx.tpl.conf > nginx.conf
-   
-  #    - name: scp
-  #      uses: appleboy/scp-action@v0.1.6
-  #      with:
-  #       host: ${{ secrets.SERVER_HOST }}
-  #       username: ${{ secrets.SERVER_USERNAME }}
-  #       key: ${{ secrets.SERVER_KEY }}
-  #       source: docker-compose.yml, nginx.conf
-  #       target: "/home/${{ secrets.SERVER_USERNAME }}/"
- 
-  #    - name: ssh
-  #      uses: appleboy/ssh-action@v0.1.6
-  #      with:
-  #       host: ${{ secrets.SERVER_HOST }}
-  #       username: ${{ secrets.SERVER_USERNAME }}
-  #       key: ${{ secrets.SERVER_KEY }}
-  #       port: 22
-  #       script: |
-  #        docker stop springboot nginx
-  #        docker rm springboot nginx
-  #        docker rmi springboot
-  #        docker rmi nginx
-        
-  #        docker pull ${{ secrets.DOCKERHUB_USERNAME }}/nextlevel-springboot:latest
-  #        docker pull ${{ secrets.DOCKERHUB_USERNAME }}/nextlevel-nginx:latest
-         
-  #        docker compose up -d
-
-  #        docker image prune -f
 
   ssh_raspberry:
     needs: build
@@ -131,15 +82,16 @@ jobs:
      - name: make docker-compose file
        env:
          PROJECT_DIR: /home/${{ secrets.RASPBERRY_USERNAME }}/withU
-         MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+         # MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
        run: |
          envsubst < docker-compose.tpl.yml > docker-compose.yml
 
      - name: make nginx file
        env:
+         PROJECT_DIR: /home/${{ secrets.RASPBERRY_USERNAME }}/withU
          SERVER_DOMAIN: ${{ secrets.RASPBERRY_HOST }}
        run: |
-         envsubst '${SERVER_DOMAIN}' < nginx.tpl.conf > nginx.conf
+         envsubst < nginx/nginx.tpl.conf > nginx.conf
    
      - name: scp
        uses: appleboy/scp-action@v0.1.6
@@ -150,6 +102,16 @@ jobs:
         port: 8082
         source: docker-compose.yml, nginx.conf
         target: "/home/${{ secrets.RASPBERRY_USERNAME }}/withU"
+
+     - name: scp default nginx
+       uses: appleboy/scp-action@v0.1.6
+       with:
+        host: ${{ secrets.RASPBERRY_HOST }}
+        username: ${{ secrets.RASPBERRY_USERNAME }}
+        password: ${{ secrets.RASPBERRY_PASSWORD }}
+        port: 8082
+        source: nextlevel.conf
+        target: "/etc/nginx/conf.d"
 
      - name: ssh
        uses: appleboy/ssh-action@v0.1.6