Merge branch 'develop' of https://github.com/atlp-rwanda/atlp-devpulse-fn into fix-ticket-loading

Author: uwituzeb

.babelrc

@@ -1,32 +1,71 @@
 name: Login to Digital Ocean and create a directory
 
 on:
-  pull_request:
+  push:
     branches:
       - develop
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    env:
+      BACKEND_URL: ${{ secrets.BACKEND_URL }}
+      CLIENT_ID: ${{ secrets.CLIENT_ID }}
+      PUSHER_KEY: ${{ secrets.PUSHER_KEY }}
+      PUSHER_CLUSTER: ${{ secrets.PUSHER_CLUSTER }}
+      REACT_APP_CLOUDINARY_UPLOAD_PRESET: ${{ secrets.REACT_APP_CLOUDINARY_UPLOAD_PRESET }}
+      REACT_APP_CLOUDINARY_NAME: ${{ secrets.REACT_APP_CLOUDINARY_NAME }}
     steps:
-      - name: Login to docker
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - name: Build and Push docker image
+
+      - name: Build and Push Docker Image
         uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/atlp-devpulse-fn:latest
-      - name: Login to DO
+
+      - name: Login to Digital Ocean Server
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.DO_HOST }}
           username: ${{ secrets.DO_USERNAME }}
           key: ${{ secrets.DO_KEY }}
           port: ${{ secrets.DO_PORT }}
+          envs: BACKEND_URL, PUSHER_KEY, PUSHER_CLUSTER, REACT_APP_CLOUDINARY_UPLOAD_PRESET, REACT_APP_CLOUDINARY_NAME, CLIENT_ID, JWT_SECRET
           script: |
-            docker pull devpulse/atlp-devpulse-fn:latest
-            docker ps | grep 4010 | cut -f1 -d' ' | xargs docker stop
-            docker run -p 4010:81 -d --add-host=devpulse-backend:161.35.150.208 devpulse/atlp-devpulse-fn:latest
+            
+            # Create .env file with required environment variables
+            cat <<EOF > .env
+            BACKEND_URL=${{ secrets.BACKEND_URL }}
+            CLIENT_ID=${{ secrets.CLIENT_ID }}
+            PUSHER_KEY=${{ secrets.PUSHER_KEY }}
+            PUSHER_CLUSTER=${{ secrets.PUSHER_CLUSTER }}
+            REACT_APP_CLOUDINARY_UPLOAD_PRESET=${{ secrets.REACT_APP_CLOUDINARY_UPLOAD_PRESET }}
+            REACT_APP_CLOUDINARY_NAME=${{ secrets.REACT_APP_CLOUDINARY_NAME }}
+            JWT_SECRET=${{ secrets.JWT_SECRET }}
+            EOF
+
+            # Pull the latest Docker image
+            docker pull ${{ secrets.DOCKER_HUB_USERNAME }}/atlp-devpulse-fn:latest
+
+            # Stop and remove any existing container on port 4010
+            existing_container=$(docker ps -q --filter "publish=4010")
+            if [ -n "$existing_container" ]; then
+              docker stop "$existing_container"
+              docker rm "$existing_container"
+            fi
+
+            # Run the new container
+            container_id=$(docker run -d \
+              -p 4010:81 \
+              --env-file .env \
+              ${{ secrets.DOCKER_HUB_USERNAME }}/atlp-devpulse-fn:latest)
+            
+            echo "Container ID: $container_id"

.circleci/config.yml

@@ -3,7 +3,7 @@ FROM node:22-alpine AS builder
 WORKDIR /app
 
 # Add the backend application in environment variables
-ENV BACKEND_URL=https://atlp-devpulse-bn.onrender.com
+ENV BACKEND_URL=https://applications-bn.devpulse.org
 
 # Copy package.json and package-lock.json
 COPY package*.json ./