commit 91ca28fe3f8ce9d184b580bb1d6c45ba7d961032
author Scott Baker <smbaker@gmail.com> Tue Jun 07 15:36:03 2016 -0700
committer Scott Baker <smbaker@gmail.com> Tue Jun 07 15:36:03 2016 -0700
tree eec6744660bfb77c227f3f3765ce927e9552d0de
parent 2d65de39ed54f83eb998d2dd3147e21d8df1f03c

fix docker-compose files

xos/configurations/frontend/Makefile

diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 9477b56..2bab097 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -1,17 +1,14 @@
 MYIP:=$(shell hostname -i)
 CONFIG_DIR:=$(shell pwd)
-DOCKER_COMPOSE_YML=./onboarding_docker_compose/docker-compose.yml
+DOCKER_COMPOSE_YML=./onboarding-docker-compose/docker-compose.yml
 BOOTSTRAP_YML=./docker-compose-bootstrap.yml
 DOCKER_PROJECT=frontend
 
 frontend: prereqs bootstrap
-#	bash ../common/wait_for_xos_file.sh onboarding-docker-compose/docker-compose.yml
-#	cp onboarding-docker-compose/docker-compose.yml .
-#	sudo docker-compose up -d
 	bash ../common/wait_for_xos_port.sh 9999
-	sudo docker-compose run xos_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/common/fixtures.yaml
-	sudo docker-compose run xos_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/common/mydeployment.yaml
-	sudo docker-compose run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/frontend/sample.yaml
+	sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/common/fixtures.yaml
+	sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/common/mydeployment.yaml
+	sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/frontend/sample.yaml
 
 prereqs:
 	sudo make -f ../common/Makefile.prereqs
@@ -30,13 +27,15 @@
 	#cd ../../../containers/xos; make devel
 
 stop:
+	test ! -s $(DOCKER_COMPOSE_YML) || sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) stop
 	sudo docker-compose -f $(BOOTSTRAP_YML) stop
 
 showlogs:
 	sudo docker-compose logs
 
 rm: stop
-	sudo docker-compose -f $(BOOTSTRAP_YML) rm
+	test ! -s $(DOCKER_COMPOSE_YML) || sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) rm
+	sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) rm
 
 ps:
 	sudo docker-compose ps
@@ -74,4 +73,4 @@
 	# fake keys are fine
 	echo somekey > key_import/exampleservice_rsa
 	echo somekey > key_import/exampleservice_rsa.pub
-	sudo docker-compose run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/onboard/exampleservice/exampleservice-onboard.yaml
+	sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) run xos_ui python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/onboard/exampleservice/exampleservice-onboard.yaml