fix

.gitignore

@@ -6,4 +6,3 @@ integration/test/motionlarity/.env.local
 integration/test/motionlarity/.up
 integration/test/devnet/.up
 integration/test/devnet/.boostready
-/docker-compose-local-dev.yml

docker-compose-local-dev-with-singularity.yml

@@ -0,0 +1,63 @@
+# To use it with a local Singularity instance, you need to make sure you have Singularity cloned in the same directory as motion
+# Use below command to run the docker compose
+# docker compose -f ./docker-compose-local-dev-with-singularity.yml up --build
+# -f specifies the docker compose configuration file
+# --build will force rebuilding Singularity or Motion if anything changes in the local code or Dockerfile
+version: '3.8'
+
+services:
+  db:
+    extends:
+      file: docker-compose.yml
+      service: db
+
+  singularity_admin_init:
+    extends:
+      file: docker-compose.yml
+      service: singularity_admin_init
+    build: ../singularity
+    image: singularity-local
+
+  singularity_api:
+    extends:
+      file: docker-compose.yml
+      service: singularity_api
+    image: singularity-local
+
+  singularity_dataset_worker:
+    extends:
+      file: docker-compose.yml
+      service: singularity_dataset_worker
+    image: singularity-local
+
+  singularity_deal_pusher:
+    extends:
+      file: docker-compose.yml
+      service: singularity_deal_pusher
+    image: singularity-local
+
+  singularity_deal_tracker:
+    extends:
+      file: docker-compose.yml
+      service: singularity_deal_tracker
+    image: singularity-local
+
+  singularity_content_provider:
+    extends:
+      file: docker-compose.yml
+      service: singularity_content_provider
+    image: singularity-local
+
+  motion:
+    extends:
+      file: docker-compose.yml
+      service: motion
+    build: .
+    image: motion-local
+
+volumes:
+  motion-singularity-volume:
+
+networks:
+  default:
+    name: motion

docker-compose-local-dev.yml

@@ -1,8 +1,7 @@
-# To use it with a local Singularity instance, you need to make sure you have Singularity cloned in the same directory as motion
 # Use below command to run the docker compose
 # docker compose -f ./docker-compose-local-dev.yml up --build
 # -f specifies the docker compose configuration file
-# --build will force rebuilding Singularity or Motion if anything changes in the local code or Dockerfile
+# --build will force rebuilding Motion if anything changes in the local code or Dockerfile
 version: '3.8'
 
 services:
@@ -15,38 +14,31 @@ services:
     extends:
       file: docker-compose.yml
       service: singularity_admin_init
-    build: ../singularity
-    image: singularity-local
 
   singularity_api:
     extends:
       file: docker-compose.yml
       service: singularity_api
-    image: singularity-local
 
   singularity_dataset_worker:
     extends:
       file: docker-compose.yml
       service: singularity_dataset_worker
-    image: singularity-local
 
   singularity_deal_pusher:
     extends:
       file: docker-compose.yml
       service: singularity_deal_pusher
-    image: singularity-local
 
   singularity_deal_tracker:
     extends:
       file: docker-compose.yml
       service: singularity_deal_tracker
-    image: singularity-local
 
   singularity_content_provider:
     extends:
       file: docker-compose.yml
       service: singularity_content_provider
-    image: singularity-local
 
   motion:
     extends: