another merge with master branch
diff --git a/containers/Makefile b/containers/Makefile
index a6aa744..92685e7 100644
--- a/containers/Makefile
+++ b/containers/Makefile
@@ -5,7 +5,6 @@
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/setup.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/images.yaml
- sudo docker exec containers_xos_1 cp /opt/xos/configurations/frontend/mocks/xos_mcord_config /opt/xos/xos_configuration/
nodes.yaml:
export SETUPDIR=.; bash ../xos/configurations/common/make-nodes-yaml.sh
@@ -15,29 +14,5 @@
.PHONY: local_containers
local_containers:
- cd xos; make devel
- cd synchronizer; make
-enter-xos:
- sudo docker exec -it containers_xos_1 bash
-
-enter-os:
- sudo docker exec -it containers_xos_synchronizer_openstack_1 bash
-
-enter-mc:
- sudo docker exec -it containers_xos_synchronizer_mcordservice1 bash
-
-upgrade_pkgs:
- sudo pip install httpie --upgrade
-
-rebuild_xos:
- make -C xos devel
-
-rebuild_synchronizer:
- make -C synchronizer
-
-stop:
- docker-compose stop
-
-rm:
- docker-compose stop; docker-compose rm
-
+ cd containers/xos; make devel
+ cd containers/synchronizer; make