Merge branch 'main' of https://github.com/Web3Novalabs/SwiftPay

Author: Yunusabdul38

.github/workflows/prod.yml

@@ -1,7 +1,7 @@
 name: Build, Test and Deploy to Prod
 
 on:
-  push:
+  push: 
     branches:
       - main
 
@@ -11,11 +11,22 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      image_tag: ${{ steps.tag.outputs.tag }}
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
+    # Create unique tag from git commit + build number
+    - name: Generate unique tag
+      id: tag
+      run: |
+        SHORT_SHA=$(git rev-parse --short HEAD)
+        TAG="build-${{ github.run_number }}-${SHORT_SHA}"
+        echo "tag=$TAG" >> $GITHUB_OUTPUT
+        echo "Generated tag: $TAG"
+
     - name: Cache dependencies
       uses: actions/cache@v3
       with:
@@ -46,21 +57,25 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push Docker images
+    - name: Build and push Docker images with unique tag
       uses: docker/bake-action@v2.3.0
+      env:
+        IMAGE_TAG: ${{ steps.tag.outputs.tag }}
       with:
         files: ./server/docker-bake.hcl
         push: true
         set: |
           *.cache-from=type=gha
           *.cache-to=type=gha,mode=max
 
-    # - name: Build and push indexer
-    #   uses: docker/build-push-action@v4
-    #   with:
-    #     context: ./the_last_indexer
-    #     push: true
-    #     tags: akshola00/paymesh-indexer:latest
+    - name: Build and push indexer with unique tag
+      uses: docker/build-push-action@v4
+      with:
+        context: ./the_last_indexer
+        push: true
+        tags: |
+          paymesh/the-last-indexer:${{ steps.tag.outputs.tag }}
+          paymesh/the-last-indexer:latest
         
   deploy:
     needs: build
@@ -84,12 +99,17 @@ jobs:
 
     - name: Deploy with environment variables
       uses: appleboy/ssh-action@master
+      env:
+        IMAGE_TAG: ${{ needs.build.outputs.image_tag }}
       with:
         host: ${{ vars.DROPLET_IP }}
         username: root
         password: ${{ secrets.DROPLET_PASSWORD }}
+        envs: IMAGE_TAG
         script: |
           cd ~
+          
+          # Create environment file
           cat > .env <<EOL
           RPC_URL=${{ secrets.RPC_URL }}
           PRIVATE_KEY=${{ secrets.PRIVATE_KEY }}
@@ -108,12 +128,31 @@ jobs:
           JWT_EXPIRED_IN=${{ secrets.JWT_EXPIRED_IN }}
           JWT_MAXAGE=${{ secrets.JWT_MAXAGE }}
           PAYMESH_API_KEY=${{ secrets.PAYMESH_API_KEY }}
+          IMAGE_TAG=${IMAGE_TAG}
           EOL
           
+          echo "Deploying with image tag: ${IMAGE_TAG}"
+          
+          # Stop, pull new images, and restart
           docker compose --env-file .env stop
           docker compose --env-file .env pull
           docker compose --env-file .env up -d
-
+          
+          # Cleanup old images - keep last 5 versions
+          echo "Cleaning up old images..."
+          docker images "paymesh/server" --format "{{.Repository}}:{{.Tag}}" | \
+            grep -v latest | \
+            sort -r | \
+            tail -n +6 | \
+            xargs -r docker rmi || true
+          
+          
+          # Remove dangling images
+          docker image prune -f
+          
+          echo "Deployment complete!"
+          echo "Running containers:"
+          docker ps
     # - name: Copy docker-compose.yml to paymesh indexer droplet
     #   run: sshpass -v -p ${{ secrets.PAYMESH_DROPLET_PASSWORD }} scp -o StrictHostKeyChecking=no the_last_indexer/docker-compose.yml root@${{ vars.PAYMESH_DROPLET_IP }}:~
 

server/docker-bake.hcl

@@ -1,6 +1,13 @@
+variable "IMAGE_TAG" {
+  default = "latest"
+}
+
 target "default" {
   dockerfile = "Dockerfile"
   context = "./server"
-  tags = ["akshola00/server:latest"]
+  tags = [
+    "paymesh/server:${IMAGE_TAG}",
+    "paymesh/server:latest"
+  ]
   platforms = ["linux/amd64"]
-}
+}

server/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   api:
-    image: akshola00/server:latest
+    image: paymesh/server:${IMAGE_TAG:-latest}
     platform: linux/amd64
     restart: always
     environment:
@@ -30,6 +30,15 @@ services:
       POSTGRES_DB: "${DATABASE_URL_DB}"
     volumes:
       - pgdata:/var/lib/postgresql/data
+
+  # indexer:
+  #   image: paymesh/the-last-indexer:${IMAGE_TAG:-latest}
+  #   restart: always
+  #   environment:
+  #     DNA_TOKEN: "${DNA_TOKEN}"
+  #     API_URL: "${API_URL}"
+  #     PAYMESH_API_KEY: "${PAYMESH_API_KEY}"
+
 
 volumes:
-  pgdata:
+  pgdata:

server/src/main.rs

@@ -48,7 +48,7 @@ async fn main() {
         .expect("Failed to create genesis admin");
 
     let listener = TcpListener::bind("0.0.0.0:8080").await.unwrap();
-    tracing::info!("listening on {}", listener.local_addr().unwrap());
+    tracing::info!("listening on port{}", listener.local_addr().unwrap());
 
     let router = router(config);
 

the_last_indexer/docker-compose.yml

@@ -1,8 +1,8 @@
 services:
   indexer:
-    image: akshola00/paymesh-indexer:latest
+    image: paymesh/the-last-indexer:${IMAGE_TAG:-latest}
     restart: always
     environment:
       DNA_TOKEN: "${DNA_TOKEN}"
       API_URL: "${API_URL}"
-      PAYMESH_API_KEY: "${PAYMESH_API_KEY}"
+      PAYMESH_API_KEY: "${PAYMESH_API_KEY}"

the_last_indexer/indexers/paymesh-starknet.indexer.ts

@@ -429,4 +429,4 @@ const subsciption_topped = (group_address: string, usage_count: number) => {
   }).catch((err) => {
     console.error(`Subscription top up error for ${group_address}:`, err);
   });
-};
+};