Apply changes to TOSCA setup to Dockerfile.devel, as they are in Dockerfile
diff --git a/containers/xos/Dockerfile.devel b/containers/xos/Dockerfile.devel
index 470c338..bcd9e7f 100644
--- a/containers/xos/Dockerfile.devel
+++ b/containers/xos/Dockerfile.devel
@@ -7,12 +7,8 @@
# Install XOS
ADD xos /opt/xos
-RUN chmod +x /opt/xos/tools/xos-manage
-RUN /opt/xos/tools/xos-manage genkeys
-
-# install Tosca engine
-RUN chmod +x /opt/xos/tosca/run.py
-RUN bash /opt/xos/tosca/install_tosca.sh
+RUN chmod +x /opt/xos/tools/xos-manage && \
+ /opt/xos/tools/xos-manage genkeys
EXPOSE 8000
diff --git a/containers/xos/Makefile b/containers/xos/Makefile
index b3445cb..1f856b7 100644
--- a/containers/xos/Makefile
+++ b/containers/xos/Makefile
@@ -23,7 +23,7 @@
TOSCA_CONFIG_PATH ?= /opt/xos/configurations/opencloud/opencloud.yaml
base:
- sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
+ sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
-f Dockerfile.base -t xosproject/xos-base .
build:
@@ -37,11 +37,11 @@
-f Dockerfile -t ${IMAGE_NAME} .
devel:
- sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
+ sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
-f Dockerfile.devel -t ${IMAGE_NAME} ../..
test:
- sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
+ sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
-f Dockerfile.test -t xosproject/xos-test ../..
run: