min

duckietown · Feb 28, 2019 · 69dc733 · 69dc733
1 parent 21aa74c
commit 69dc733
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -74,11 +74,11 @@ jobs:
           name: Build docker example
           command: |
             find minimal-nodes-stubs
-            cd minimal-nodes-stubs && docker-compose build
+            make -C minimal-nodes-stubs test-docker-build
       - run:
           name: Run docker example
           command: |
-            cd minimal-nodes-stubs && docker-compose up
+            make -C minimal-nodes-stubs test-docker-up
 
       - run:
           name: Coverage analysis

diff --git a/minimal-nodes-stubs/Makefile b/minimal-nodes-stubs/Makefile
@@ -22,7 +22,11 @@ test-all_connected:
 	./dummy_image_filter/dummy_image_filter.py run --name node2   | \
 	./random_agent/random_agent.py run --name agent  --translate in:image:camera_image
 
+test-docker-build:
+	docker-compose build
 
+test-docker-up:
+	docker-compose up
 
 test-all_connected-docker:
 	#protocols=/data/work/vmware-michela-shared/DT/dt-env/dt-env-developer/src/aido-protocols

diff --git a/minimal-nodes-stubs/docker-compose.yaml b/minimal-nodes-stubs/docker-compose.yaml
@@ -6,8 +6,8 @@ services:
       context: ./dummy_image_source
     volumes: &volumes
       - "fifos:/fifos"
-      #      - ../src:/src/aido-protocols/src
       - "./test_data:/test_data"
+      #      - ../src:/src/aido-protocols/src
     cpu_percent: 50
     mem_limit: 100MB