fix: address additional PR feedback and cleaned up Make targets and d…

…ocker compose Signed-off-by: Sean O'Hair <[email protected]>
intel-retail · Oct 25, 2023 · a56652e · a56652e
1 parent 2d1c56f
commit a56652e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 42 deletions.
diff --git a/Makefile b/Makefile
@@ -9,6 +9,7 @@ GOREPOS=device-scale event-reconciler loss-detector product-lookup
 .PHONY: $(REPOS)
 
 DOCKER_TAG=dev
+STACK_NAME=loss-detection
 
 docker-rm:
 	-docker rm $$(docker ps -aq)
@@ -18,33 +19,27 @@ clean-docker: docker-rm
 	docker network prune -f
 
 run-portainer:
-	cd ./loss-detection-app && docker compose -f docker-compose.portainer.yml up -d
+	cd ./loss-detection-app && docker compose -p portainer -f docker-compose.portainer.yml up -d
 
 run-edgex:
-	cd ./loss-detection-app && docker compose -f docker-compose.edgex.yml up -d
+	cd ./loss-detection-app && docker compose -p ${STACK_NAME} -f docker-compose.edgex.yml up -d
 
 run-base:
 	cd ./loss-detection-app && \
-	docker compose -f docker-compose.edgex.yml up -d && \
-	docker compose -f docker-compose.loss-detection.yml up -d
+	docker compose -p ${STACK_NAME} -f docker-compose.edgex.yml -f docker-compose.loss-detection.yml up -d
 
-run-vap: models run-base
+run-vap: models
 	cd ./loss-detection-app && \
-	docker compose -f docker-compose.vap.yml up -d
+	docker compose -p ${STACK_NAME} -f docker-compose.edgex.yml -f docker-compose.loss-detection.yml -f docker-compose.vap.yml up -d
 
 run-full: run-vap
 
 down:
 	cd ./loss-detection-app && \
-	docker compose -f docker-compose.vap.yml down && \
-	docker compose -f docker-compose.loss-detection.yml down && \
-	docker compose -f docker-compose.edgex.yml down
+	docker compose -p ${STACK_NAME} -f docker-compose.edgex.yml -f docker-compose.loss-detection.yml -f docker-compose.vap.yml down -v
 
-vap-down:
-	cd ./loss-detection-app && \
-	docker compose -f docker-compose.vap.yml down && \
-	docker compose -f docker-compose.loss-detection.yml down && \
-	docker compose -f docker-compose.edgex.yml down
+down-portainer:
+	cd ./loss-detection-app && docker compose -p portainer -f docker-compose.portainer.yml down
 
 models:
 	if [ ! -d pipeline-server ] ; then git clone https://github.com/dlstreamer/pipeline-server; fi && \

diff --git a/loss-detection-app/docker-compose.edgex.yml b/loss-detection-app/docker-compose.edgex.yml
@@ -16,8 +16,7 @@
 # NOTE:  this Docker Compose file does not contain the security services - namely the API Gateway
 # and Secret Store
 networks:
-  loss-detection-app_edgex-network:
-    name: loss-detection-app_edgex-network
+  edgex-network:
     driver: bridge
 services:
   core-command:
@@ -39,7 +38,7 @@ services:
     hostname: edgex-core-command
     image: edgexfoundry/core-command:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -63,7 +62,7 @@ services:
     hostname: edgex-core-consul
     image: hashicorp/consul:1.15.2
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -102,7 +101,7 @@ services:
     hostname: edgex-core-data
     image: edgexfoundry/core-data:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -119,7 +118,7 @@ services:
     hostname: edgex-redis
     image: redis:7.0.11-alpine
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -158,7 +157,7 @@ services:
     hostname: edgex-device-mqtt
     image: edgexfoundry/device-mqtt:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -188,7 +187,7 @@ services:
     hostname: edgex-device-rest
     image: edgexfoundry/device-rest:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -215,7 +214,7 @@ services:
     hostname: edgex-core-metadata
     image: edgexfoundry/core-metadata:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -236,7 +235,7 @@ services:
     hostname: edgex-mqtt-broker
     image: eclipse-mosquitto:2.0.15
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -263,7 +262,7 @@ services:
     hostname: edgex-support-notifications
     image: edgexfoundry/support-notifications:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       host_ip: 127.0.0.1
@@ -283,7 +282,7 @@ services:
     hostname: edgex-ui-go
     image: edgexfoundry/edgex-ui:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     ports:
     - mode: ingress
       target: 4000
@@ -310,7 +309,7 @@ services:
     hostname: edgex-core-common-config-bootstrapper
     image: edgexfoundry/core-common-config-bootstrapper:3.0.0
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     read_only: true
     security_opt:
     - no-new-privileges:true

diff --git a/loss-detection-app/docker-compose.loss-detection.yml b/loss-detection-app/docker-compose.loss-detection.yml
@@ -15,11 +15,6 @@
 
 version: '3.7'
 
-networks:
-  loss-detection-app_edgex-network:
-    name: loss-detection-app_edgex-network
-    driver: bridge
-
 volumes:
   db_vol: {}
   pos_vol: {}
@@ -34,7 +29,7 @@ services:
       container_name: event-reconciler
       hostname: event-reconciler
       networks:
-        loss-detection-app_edgex-network: {}
+        edgex-network: {}
       environment:
         EDGEX_SECURITY_SECRET_STORE: "false"
         SERVICE_HOST: event-reconciler
@@ -48,7 +43,7 @@ services:
       container_name: device-scale
       hostname: device-scale
       networks:
-        loss-detection-app_edgex-network: {}
+        edgex-network: {}
       environment:
         EDGEX_SECURITY_SECRET_STORE: "false"
         SERVICE_HOST: device-scale
@@ -67,7 +62,7 @@ services:
       container_name: product-lookup
       hostname: product-lookup
       networks:
-        loss-detection-app_edgex-network: {}
+        edgex-network: {}
       security_opt:
       - no-new-privileges:true
 
@@ -79,7 +74,7 @@ services:
       container_name: loss-detector
       hostname: loss-detector
       networks:
-        loss-detection-app_edgex-network: {}
+        edgex-network: {}
       environment:
         CLIENTS_CORE_COMMAND_HOST: edgex-core-command
         EDGEX_SECURITY_SECRET_STORE: "false"

diff --git a/loss-detection-app/docker-compose.vap.yml b/loss-detection-app/docker-compose.vap.yml
@@ -15,10 +15,6 @@
 
 version: '3.7'
 
-networks:
-  loss-detection-app_edgex-network:
-    external: true
-
 services:
   cv-region-of-interest:
     image: rtsf-at-checkout/cv-region-of-interest:dev
@@ -40,7 +36,7 @@ services:
       - CAMERA0_FRAME_STORE=/tmp/my-frame-store
     user: "${UID}:${GID}"
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     volumes:
       - /tmp:/tmp
     depends_on:
@@ -55,7 +51,7 @@ services:
     hostname: pipeline-server
     privileged: true
     networks:
-      loss-detection-app_edgex-network: {}
+      edgex-network: {}
     environment:
       - ENABLE_RTSP=true
       - EMIT_SOURCE_AND_DESTINATION=true