move prereqs into separate section and more stuff into bootstrap
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 99f8ec0..9477b56 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -2,22 +2,26 @@
CONFIG_DIR:=$(shell pwd)
DOCKER_COMPOSE_YML=./onboarding_docker_compose/docker-compose.yml
BOOTSTRAP_YML=./docker-compose-bootstrap.yml
+DOCKER_PROJECT=frontend
-frontend: bootstrap
- sudo docker-compose -f $(BOOTSTRAP_YML) run -e CONFIG_DIR=$(CONFIG_DIR) xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/frontend/xos.yaml
- sudo rm -f onboarding-docker-compose/docker-compose.yml
- 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
+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
-bootstrap:
+prereqs:
sudo make -f ../common/Makefile.prereqs
- sudo docker-compose -f docker-compose-bootstrap.yml up -d
+
+bootstrap:
+ sudo rm -f onboarding-docker-compose/docker-compose.yml
+ sudo rm -f docker-compose.yml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f docker-compose-bootstrap.yml up -d
bash ../common/wait_for_xos_port.sh 9998
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run -e CONFIG_DIR=$(CONFIG_DIR) xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/configurations/frontend/xos.yaml
containers:
cd ../../../containers/xos; make devel