diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-03-03 07:26:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-03 07:26:10 +0000 |
| commit | 9c0bec3c358a7e79b8970f1c518c6cdc7c2ab5f1 (patch) | |
| tree | 8e1b8bda49bc0a0f1377b09e1f1d52a58a2bc928 | |
| parent | a5cb507c061738a50ca358147a135a1c4498ff22 (diff) | |
| parent | e46ef6e6d12c3adeea921bb02159161ee6d5c9df (diff) | |
Merge "Use python setup.py develop to install repos"
| -rw-r--r-- | docker/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index de47e157a..38161d1d1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -108,10 +108,10 @@ RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt RUN cd ${FUNCTEST_REPO_DIR} \ && pip install -r requirements.txt \ - && pip install . + && pip install -e . RUN cd ${RELENG_MODULE_DIR} \ - && pip install . + && pip install -e . RUN cd ${REPOS_DIR}/barometer \ && pip install . @@ -133,12 +133,11 @@ RUN pip install -e ${REPOS_DIR}/snaps/ # SFC integration RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" -RUN cd ${REPOS_DIR}/sfc && pip install . +RUN cd ${REPOS_DIR}/sfc && pip install -e . # SDNVPN integration -RUN cd ${REPOS_DIR}/sdnvpn && pip install . - -RUN cd ${REPOS_DIR}/bgpvpn && pip install . +RUN cd ${REPOS_DIR}/sdnvpn && pip install -e . +RUN cd ${REPOS_DIR}/bgpvpn && pip install -e . # Kingbird integration RUN cd ${REPOS_DIR}/kingbird && pip install -e . diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index a469801f3..82add067b 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -105,10 +105,10 @@ RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt RUN cd ${FUNCTEST_REPO_DIR} \ && pip install -r requirements.txt \ - && pip install . + && pip install -e . RUN cd ${RELENG_MODULE_DIR} \ - && pip install . + && pip install -e . RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \ -not -path "*tests/unit*" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \ @@ -127,12 +127,11 @@ RUN pip install -e ${REPOS_DIR}/snaps/ # SFC integration RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" -RUN cd ${REPOS_DIR}/sfc && pip install . +RUN cd ${REPOS_DIR}/sfc && pip install -e . # SDNVPN integration -RUN cd ${REPOS_DIR}/sdnvpn && pip install . - -RUN cd ${REPOS_DIR}/bgpvpn && pip install . +RUN cd ${REPOS_DIR}/sdnvpn && pip install -e . +RUN cd ${REPOS_DIR}/bgpvpn && pip install -e . # Kingbird integration RUN cd ${REPOS_DIR}/kingbird && pip install -e . |