Merged Master
diff --git a/xos/configurations/cord/Makefile b/xos/configurations/cord/Makefile
index 755f704..0dc7a73 100644
--- a/xos/configurations/cord/Makefile
+++ b/xos/configurations/cord/Makefile
@@ -3,7 +3,7 @@
LAST_CONTAINER=$(shell sudo docker ps -l -q)
cord: common_cloudlab ceilometer_dashboard virtualbng_json vtn_network_cfg_json
- rm ../../xos_configuration/*
+ if [ -a ../../xos_configuration/* ]; then rm ../../xos_configuration/*; fi
echo "# Autogenerated -- do not edit" > Dockerfile
cat ../common/Dockerfile.common Dockerfile.cord >> Dockerfile
cp ../common/xos_common_config ../../xos_configuration/
diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index f33479f..97a9806 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -9,7 +9,7 @@
opencloud: common_opencloud xos
xos:
- rm ../../xos_configuration/*
+ if [ -a ../../xos_configuration/* ]; then rm ../../xos_configuration/*; fi
cp ../common/xos_common_config ../../xos_configuration/
echo "# Autogenerated -- do not edit" > Dockerfile
cat ../common/Dockerfile.common Dockerfile.devel >> Dockerfile
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index e30877a..96b0779 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -6,7 +6,7 @@
all: frontend
frontend:
- rm ../../xos_configuration/*
+ if [ -a ../../xos_configuration/* ]; then rm ../../xos_configuration/*; fi
sudo apt-get -y install httpie
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
cp ../common/xos_common_config ../../xos_configuration/
@@ -16,7 +16,7 @@
echo $(RUNNING_CONTAINER)
interactive:
- rm ../../xos_configuration/*
+ if [ -a ../../xos_configuration/* ]; then rm ../../xos_configuration/*; fi
cat ../common/Dockerfile.common Dockerfile.frontend > Dockerfile
cp ../common/xos_common_config ../../xos_configuration/
#cp ../cord/xos_cord_config ../../xos_configuration/
diff --git a/xos/configurations/test/Makefile b/xos/configurations/test/Makefile
index b1cca93..75143fa 100644
--- a/xos/configurations/test/Makefile
+++ b/xos/configurations/test/Makefile
@@ -1,6 +1,7 @@
MYIP:=$(shell hostname -i)
test: common_cloudlab
+ if [ -a ../../xos_configuration/* ]; then rm ../../xos_configuration/*; fi
cat ../common/Dockerfile.common Dockerfile.test > Dockerfile
cd ../../..; sudo docker build -t xos -f xos/configurations/test/Dockerfile .
# sudo docker run -d --add-host="ctl:$(MYIP)" -p 9999:8000 xos