fix: Add missing option for adding Device Camera (#345)

* fix: Add missing option for adding Device Camera

closes #344

Signed-off-by: lenny <[email protected]>

Author: lenny-goodell

compose-builder/.env

@@ -35,6 +35,7 @@ KUIPER_VERSION=1.0.0-alpine
 MOSQUITTO_VERSION=1.6.3
 APP_SERVICE_VERSION=master
 DEVICE_BACNET_VERSION=master
+DEVICE_CAMERA_VERSION=master
 DEVICE_GROVE_VERSION=master
 DEVICE_MODBUS_VERSION=master
 DEVICE_MQTT_VERSION=master

compose-builder/Makefile

@@ -19,7 +19,7 @@
 include .env
 
 COMPOSE_FILES:=-f docker-compose-base.yml
-OPTIONS:=" arm64 no-secty mqtt dev ui ds-bacnet ds-grove ds-modbus ds-mqtt ds-random ds-rest ds-snmp ds-virtual" # Must have spaces around words for `filter-out` function to work properly
+OPTIONS:=" arm64 no-secty mqtt dev ui ds-bacnet ds-camera ds-grove ds-modbus ds-mqtt ds-random ds-rest ds-snmp ds-virtual" # Must have spaces around words for `filter-out` function to work properly
 
 ARGS:=$(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 $(eval $(ARGS):;@:)
@@ -39,6 +39,9 @@ endif
 ifeq (ds-bacnet, $(filter ds-bacnet,$(ARGS)))
 	COMPOSE_FILES:=$(COMPOSE_FILES) -f add-device-bacnet.yml
 endif
+ifeq (ds-camera, $(filter ds-camera,$(ARGS)))
+	COMPOSE_FILES:=$(COMPOSE_FILES) -f add-device-camera.yml
+endif
 ifeq (ds-grove, $(filter ds-grove,$(ARGS)))
     DS_GROVE:=true
 	COMPOSE_FILES:=$(COMPOSE_FILES) -f add-device-grove.yml
@@ -154,6 +157,7 @@ down: ui-down
 	docker-compose -p edgex \
 		-f docker-compose-base.yml \
 		-f add-device-bacnet.yml \
+		-f add-device-camera.yml \
 		-f add-device-grove.yml \
 		-f add-device-modbus.yml \
 		-f add-device-mqtt.yml \

compose-builder/README.md

@@ -32,6 +32,8 @@ This folder contains the following compose files:
     Security **extending** compose file. Adds the additional security services and configuration of services so that all the services are running in the secure configuration.
 - **add-device-bacnet.yml**
     Device Service **extending** compose file, which adds the **Device Bacnet**  service.
+- **add-device-camera.yml**
+    Device Service **extending** compose file, which adds the **Device Camera**  service.
 - **add-device-grove.yml**
     Device Service **extending** compose file, which adds the **Device Grove**  service.
 - **add-device-modbus.yml**
@@ -96,6 +98,7 @@ Options:
     dev:        Generates compose file using local dev built images from edgex-go repo's 
                 'make docker' which creates docker images tagged with '0.0.0-dev'    
     ds-bacnet:  Generates compose file with device-bacnet included
+    ds-camera:  Generates compose file with device-camera included
     ds-grove:   Generates compose file with device-grove included (valid only with arm64 option)
     ds-modbus:  Generates compose file with device-modbus included
     ds-mqtt:    Generates compose file with device-mqtt included
@@ -117,6 +120,7 @@ Options:
                 'make docker' which creates docker images tagged with '0.0.0-dev'
     ds-modbus:  Runs with device-modbus included
     ds-bacnet:  Runs with device-bacnet included
+    ds-camera:  Runs with device-camera included
     ds-grove:   Runs with device-grove included (valid only with arm64 option)
     ds-mqtt:    Runs with device-mqtt included
     ds-random:  Runs with device-random included
@@ -135,6 +139,7 @@ Options:
     no-secty:   Pulls images for Non-Secure Mode, otherwise pull images for Secure Mode
     arm64:      Pulls ARM64 version of images    
     ds-bacnet:  Pull includes device-bacnet 
+    ds-camera:  Pull includes device-camera
     ds-grove:   Pull includes device-grove (valid only with arm64 option)
     ds-modbus:  Pull includes device-modbus 
     ds-mqtt:    Pull includes device-mqtt
@@ -157,6 +162,7 @@ Options:
                 'make docker' which creates docker images tagged with '0.0.0-dev'
     ds-modbus:  Generates compose file with device-modbus included
     ds-bacnet:  Generates compose file with device-bacnet included
+    ds-camera:  Generates compose file with device-camera included
     ds-grove:   Generates compose file with device-grove included (valid only with arm64 option)
     ds-mqtt:    Generates compose file with device-mqtt included
     ds-random:  Generates compose file with device-random included

compose-builder/add-device-camera.yml

@@ -0,0 +1,38 @@
+# /*******************************************************************************
+#  * Copyright 2020 Intel Corporation.
+#  *
+#  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+#  * in compliance with the License. You may obtain a copy of the License at
+#  *
+#  * http://www.apache.org/licenses/LICENSE-2.0
+#  *
+#  * Unless required by applicable law or agreed to in writing, software distributed under the License
+#  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+#  * or implied. See the License for the specific language governing permissions and limitations under
+#  * the License.
+#  *
+#  * @author: Leonard Goodell
+#  * EdgeX Foundry, Hanoi, version "master"
+#  * added: October, 2020
+#  *******************************************************************************/
+
+version: '3.7'
+
+services:
+  device-rest:
+    image: ${REPOSITORY}/docker-device-camera-go${ARCH}:${DEVICE_CAMERA_VERSION}
+    ports:
+      - "127.0.0.1:49986:49986"
+    container_name: edgex-device-camera
+    hostname: edgex-device-camera
+    read_only: true
+    networks:
+      - edgex-network
+    env_file:
+      - common.env
+    environment:
+      SERVICE_HOST: edgex-device-camera
+    depends_on:
+      - consul
+      - data
+      - metadata