From 7f49ce8f0455527bb29241b6424e5dbbf6760894 Mon Sep 17 00:00:00 2001 From: Federico Claramonte Date: Wed, 27 Sep 2017 11:37:01 +0200 Subject: [PATCH 1/3] Add device dockers Signed-off-by: Federico Claramonte --- create-containers.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/create-containers.sh b/create-containers.sh index 1f4f4b3..3e3d725 100755 --- a/create-containers.sh +++ b/create-containers.sh @@ -18,9 +18,9 @@ set -e -DOCKERS=( docker-edgex-volume docker-core-consul docker-core-config-seed docker-edgex-mongo support-logging \ - support-notifications core-metadata core-data core-command support-scheduler export-client \ - export-distro support-rulesengine device-virtual ) +DOCKERS=( docker-edgex-volume docker-core-consul core-config-seed docker-edgex-mongo support-logging \ + support-notifications core-metadata core-data core-command support-scheduler export-client \ + export-distro support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp) DOCKERFILE=$1 From 06ff41375c13efa00439aa2aae87eadd935665c4 Mon Sep 17 00:00:00 2001 From: Federico Claramonte Date: Wed, 27 Sep 2017 11:38:07 +0200 Subject: [PATCH 2/3] Update gitignore with git repos Signed-off-by: Federico Claramonte --- .gitignore | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.gitignore b/.gitignore index aa01b46..c54001b 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,35 @@ Icon log/ target/ + +# git repos +core-command/ +core-config-seed/ +core-data-client/ +core-data/ +core-domain/ +core-exception/ +core-metadata-client/ +core-metadata/ +core-test/ +device-bacnet/ +device-bluetooth/ +device-modbus/ +device-mqtt/ +device-snmp/ +device-virtual/ +docker-core-config-seed/ +docker-core-consul/ +docker-edgex-mongo/ +docker-edgex-volume/ +export-client/ +export-distro/ +export-domain/ +export-test/ +support-domain/ +support-logging-client/ +support-logging/ +support-notifications-client/ +support-notifications/ +support-rulesengine/ +support-scheduler/ From 6a332cff2b3c0c0ca21b33abcdfccbc6b0acdd62 Mon Sep 17 00:00:00 2001 From: Federico Claramonte Date: Wed, 27 Sep 2017 11:39:18 +0200 Subject: [PATCH 3/3] Remove tabs Signed-off-by: Federico Claramonte --- create-containers.sh | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/create-containers.sh b/create-containers.sh index 3e3d725..8732486 100755 --- a/create-containers.sh +++ b/create-containers.sh @@ -25,44 +25,43 @@ DOCKERS=( docker-edgex-volume docker-core-consul core-config-seed docker-edgex-m DOCKERFILE=$1 usage(){ - echo -e "ERROR! Dockerfile name not found." - echo -e "\tI.E: ./${0} Dockerfile.aarch64" - exit + echo -e "ERROR! Dockerfile name not found." + echo -e "\tI.E: ./${0} Dockerfile.aarch64" + exit } if [[ -z ${DOCKERFILE} ]]; then - usage + usage fi for m in ${DOCKERS[@]} ; do - if [ -d $m ]; then - echo "Updating git modules... " - cd $m - git pull - cd .. - else - echo "Cloning $m" + if [ -d $m ]; then + echo "Updating git modules... " + cd $m + git pull + cd .. + else + echo "Cloning $m" git clone https://github.com/edgexfoundry/$m - fi - if [ -f $m/docker-files/${DOCKERFILE} ] ; then + fi + if [ -f $m/docker-files/${DOCKERFILE} ] ; then echo "Creating docker image $m" cd $m docker build . -t edgexfoundry/docker-$m -f docker-files/${DOCKERFILE} echo $m cd .. - + elif [ -f $m/${DOCKERFILE} ] ; then echo "Creating docker image $m" cd $m docker build . -t edgexfoundry/$m -f ${DOCKERFILE} echo $m cd .. - else - usage - fi + else + usage + fi done echo "Done!" -