Merge pull request #20 from swecc-uw/elimelt-patch-1

Update github-actions-ec2.yml
swecc-uw · Aug 11, 2024 · 7f12a44 · 7f12a44
2 parents 0ef9495 + 9c43e31
commit 7f12a44
Showing 1 changed file with 16 additions and 27 deletions.
diff --git a/.github/workflows/github-actions-ec2.yml b/.github/workflows/github-actions-ec2.yml
@@ -1,24 +1,19 @@
 name: Push-to-EC2
-
-# Trigger deployment only on push to master branch
 on:
   push:
     branches:
       - main
-
 jobs:
   build:
     runs-on: self-hosted
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v2
-
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-
     - name: Build and push Docker image
       uses: docker/build-push-action@v2
       with:
@@ -27,29 +22,23 @@ jobs:
         tags: |
           ${{ secrets.DOCKERHUB_USERNAME }}/swecc-server:latest
           ${{ secrets.DOCKERHUB_USERNAME }}/swecc-server:${{ github.sha }}
-
     - name: Deploy application
-      env:
-        DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        DJANGO_DEBUG: ${{secrets.DJANGO_DEBUG}}
-        DB_HOST: ${{secrets.DB_HOST}}
-        DB_NAME: ${{secrets.DB_NAME}}
-        DB_PORT: ${{secrets.DB_PORT}}
-        DB_USER: ${{secrets.DB_USER}}
-        DB_PASSWORD: ${{secrets.DB_PASSWORD}}
+      uses: addnab/docker-run-action@v3
+      with:
+        image: ${{ secrets.DOCKERHUB_USERNAME }}/swecc-server:latest
+        options: |
+          -p 8000:8000
+          -e DJANGO_DEBUG=${{ secrets.DJANGO_DEBUG }}
+          -e DB_HOST=${{ secrets.DB_HOST }}
+          -e DB_NAME=${{ secrets.DB_NAME }}
+          -e DB_PORT=${{ secrets.DB_PORT }}
+          -e DB_USER=${{ secrets.DB_USER }}
+          -e DB_PASSWORD=${{ secrets.DB_PASSWORD }}
+          --name swecc-server-be-container
+        run: |
+          echo "Container is running"
+          # Add any additional commands you want to run inside the container
+    - name: Clean up old container
       run: |
-        cd /home/ubuntu
-        echo $DJANGO_DEBUG
-        echo $DOCKERHUB_USERNAME
         docker stop swecc-server-be-container || true
         docker rm swecc-server-be-container || true
-        docker pull  ${{ secrets.DOCKERHUB_USERNAME }}/swecc-server:latest
-        docker run --name swecc-server-be-container \
-          -p 8000:8000 \
-          -e DJANGO_DEBUG=$DJANGO_DEBUG \
-          -e DB_HOST=$DB_HOST \
-          -e DB_NAME=$DB_NAME \
-          -e DB_PORT=$DB_PORT \
-          -e DB_USER=$DB_USER \
-          -e DB_PASSWORD=$DB_PASSWORD \
-          -d ${{ secrets.DOCKERHUB_USERNAME }}/swecc-server:latest