Merge pull request #73 from snuhcs-course/dev

Merge dev into main

.github/workflows/docker_build_push.yml

@@ -5,7 +5,9 @@ on:
     branches:
       - main
       - dev
-
+      - feat/ML_server
+    paths:
+      - 'backend/**'
 
 jobs:
   build:
@@ -24,6 +26,11 @@ jobs:
         docker build -t "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" .
         docker push "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest"
     
+    - name: Add SSH key for EC2 instance
+      run: |
+        mkdir -p ~/.ssh
+        ssh-keyscan -H ${{ secrets.CLOUD_URL }} >> ~/.ssh/known_hosts
+
     - name: Stop Docker Container, Clean Up, Pull & Run
       run: | 
         set +x
@@ -37,5 +44,5 @@ jobs:
           docker rmi "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest"
           echo "Pulling new image..."
           docker pull "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest"
-          docker run -d --name haeng -p 8080:8000 --env-file haengsha-env/.env "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest"
+          docker run -d --name haeng -p 8080:8000 --env-file haengsha-env/.env -v shared-volume:/haengvolume "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest"
         EOF

.github/workflows/ml_update.yml

@@ -0,0 +1,53 @@
+name: Update ML Container
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - feat/ML_server
+    paths:
+      - 'recommend/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+        - name: Checkout code
+          uses: actions/checkout@v2
+
+        - name: Add SSH key for EC2 instance
+          run: |
+            mkdir -p ~/.ssh
+            ssh-keyscan -H ${{ secrets.CLOUD_URL }} >> ~/.ssh/known_hosts
+
+        - name: Transfer Recommendation Script
+          run: | 
+            set +x
+            echo "${{ secrets.PEM }}" > key.pem 
+            set -x
+            chmod 600 key.pem
+            scp -i ./"key.pem" -o StrictHostKeyChecking=no ./recommendation_pipeline.sh ec2-user@${{ secrets.CLOUD_URL }}:~
+            scp -i ./"key.pem" -o StrictHostKeyChecking=no ./cron_routine.sh ec2-user@${{ secrets.CLOUD_URL }}:~
+            chmod +x cron_routine.sh
+
+        - name: Sync ML Code
+          run: |
+            set +x
+            echo "${{ secrets.PEM }}" > key.pem 
+            set -x
+            chmod 600 key.pem
+            rsync -avz -e "ssh -o StrictHostKeyChecking=no -i ./key.pem" ./recommend/ ec2-user@${{ secrets.CLOUD_URL }}:/home/ec2-user/recommend/
+
+        - name: Restart ML Container & Mount Code
+          run: |
+            set +x
+            echo "${{ secrets.PEM }}" > key.pem 
+            set -x
+            chmod 600 key.pem
+            ssh -i ./"key.pem" -o StrictHostKeyChecking=no ec2-user@${{ secrets.CLOUD_URL }} <<EOF
+              docker stop ml-container
+              docker rm ml-container
+              docker run -d --name ml-container -v /home/ec2-user/recommend:/app -v shared-volume:/mlvolume "${{ secrets.DOCKER_USERNAME }}/ml-image:latest" tail -f /dev/null
+            EOF

backend/Dockerfile

@@ -5,9 +5,9 @@ WORKDIR /app
 COPY requirements.txt requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Generate and store the checksum
-RUN find /app/ -type f -exec sha256sum {} + > app_checksum.txt
-
 COPY . .
 
+# Generate and store the checksum
+RUN find /app/ -type f -print0 | sort -z | xargs -0 sha256sum > app_checksum.txt
+
 CMD ["gunicorn", "haengsha.wsgi:application", "--bind", "0.0.0.0:8000"]