Update ODL tag to release/carbon

[functest.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 54d526d..910be83 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 # Environment variables
 ARG BRANCH=master
 ARG RALLY_TAG=0.8.1
-ARG ODL_TAG=release/beryllium-sr4
+ARG ODL_TAG=release/carbon
 ARG OPENSTACK_TAG=stable/ocata
 ARG KINGBIRD_TAG=1.1.0
 ARG VIMS_TAG=stable
@@ -84,7 +84,6 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
     rm thirdparty-requirements.txt upper-constraints.txt
 
 # OPNFV repositories
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds
@@ -120,7 +119,7 @@ RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
 
 RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \
     && sudo apt-get install -y nodejs \
-    && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \
-    && cd ${REPOS_DIR}/promise/source && npm install
+    && cd /src/promise && sudo npm -g install npm@latest \
+    && cd /src/promise/source && npm install
 
 RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc