latest cmmitsMerge branch 'dev2' of https://github.com/Adeesh-bode/FXModel into dev2

Author: Adeesh-bode

.github/workflows/deploy-ec2-ci-ssh.yml

@@ -3,7 +3,7 @@ name: Deploy on EC2 CI
 on:
   push:
     branches:
-      - deploy-fxmodel-docker
+      - dev2
 
 jobs:
   deploy:
@@ -18,19 +18,37 @@ jobs:
           ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
 
       - name: Deploy on EC2
-        # checks if no folder than clones , if exists than pulls latest
-        # shell scripting, fi is used to mark the end of an if statement
-        # In shell scripting, EOF (End of File) is commonly used to denote the end of a block of text that is being redirected as input to a command
         run: |
           ssh ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'EOF'
+          
+          # === INSTALL DOCKER IF NOT INSTALLED ===
+          if ! command -v docker &> /dev/null; then
+            echo "Installing Docker..."
+            sudo apt-get update
+            sudo apt-get install -y ca-certificates curl gnupg
+            sudo install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo \
+              "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+              $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+              sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            sudo apt-get update
+            sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+          fi
+
+          # === CLONE OR UPDATE PROJECT ===
           cd /home/ubuntu
           if [ ! -d "fxmodelci" ]; then
             git clone https://github.com/Adeesh-bode/FXModel.git fxmodelci
           else
             cd fxmodelci
             git pull origin deploy-fxmodel-docker
           fi
+
           cd /home/ubuntu/fxmodelci
-          docker-compose down
-          docker-compose up -d --build
+
+          # === RUN DOCKER COMPOSE ===
+          docker compose down
+          docker compose up -d --build
+
           EOF

.github/workflows/main.yml

@@ -0,0 +1,53 @@
+name: Deploy on EC2 CI
+
+on:
+  push:
+    branches:
+      - dev2
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up SSH
+        run: |
+          mkdir -p ~/.ssh  
+          echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Deploy on EC2
+        run: |
+          ssh ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'EOF'
+            # Install Docker if not already installed
+            if ! command -v docker &> /dev/null
+            then
+              echo "Installing Docker..."
+              sudo apt update
+              sudo apt install -y docker.io
+              sudo systemctl start docker
+              sudo systemctl enable docker
+              sudo usermod -aG docker $USER
+            fi
+
+            # Install Docker Compose if not already installed
+            if ! command -v docker-compose &> /dev/null
+            then
+              echo "Installing Docker Compose..."
+              sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+              sudo chmod +x /usr/local/bin/docker-compose
+            fi
+
+            cd /home/ubuntu
+            if [ ! -d "fxmodelci" ]; then
+              git clone https://github.com/Adeesh-bode/FXModel.git fxmodelci
+            else
+              cd fxmodelci
+              git pull origin deploy-fxmodel-docker
+            fi
+
+            cd /home/ubuntu/fxmodelci
+            sudo docker-compose down
+            sudo docker-compose up -d --build
+          EOF