Best practices and remove tosca script install
diff --git a/containers/xos/Dockerfile b/containers/xos/Dockerfile
index 958d8ae..cbaad65 100644
--- a/containers/xos/Dockerfile
+++ b/containers/xos/Dockerfile
@@ -4,19 +4,14 @@
ADD local_certs.crt /usr/local/share/ca-certificates/local_certs.crt
RUN update-ca-certificates
-# Install XOS
+# Install and boostrap XOS and Tosca
ENV XOS_GIT_REPO git://github.com/open-cloud/xos.git
ENV XOS_GIT_BRANCH master
RUN git clone $XOS_GIT_REPO -b $XOS_GIT_BRANCH /tmp/xos && \
- mv /tmp/xos/xos /opt/
-
-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
+ mv /tmp/xos/xos /opt/ && \
+ chmod +x /opt/xos/tools/xos-manage && \
+ /opt/xos/tools/xos-manage genkeys
EXPOSE 8000
diff --git a/containers/xos/Dockerfile.test b/containers/xos/Dockerfile.test
index 7829c21..ac3c14c 100644
--- a/containers/xos/Dockerfile.test
+++ b/containers/xos/Dockerfile.test
@@ -2,14 +2,16 @@
# install nodejs
COPY containers/xos/nodesource.gpg.key /tmp/nodesource.gpg.key
-RUN apt-key add /tmp/nodesource.gpg.key
-RUN echo "deb https://deb.nodesource.com/node_4.x trusty main" \
- > /etc/apt/sources.list.d/nodesource.list
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --force-yes \
- nodejs
+RUN apt-key add /tmp/nodesource.gpg.key && \
+ echo "deb https://deb.nodesource.com/node_4.x trusty main" \
+ > /etc/apt/sources.list.d/nodesource.list
+
+RUN apt-get update && apt-get install -y --force-yes nodejs && \
+ rm -rf /var/lib/apt/lists/*
RUN node -v
# install node modules
# RUN cd /opt/xos/tests/api; npm install
+