diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-03-22 23:26:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-22 23:26:24 +0000 |
| commit | 62b5eb7fcec9b9ced3dfdd721a656c98538bfc7c (patch) | |
| tree | 943603ebc991b63de0734dbf0e115c4ea439ef58 | |
| parent | 569182f4b24de6b0f020754d717129a82d19930b (diff) | |
| parent | 089fb510271465f915e4b3a929653a9299989f96 (diff) | |
Merge "Fix Dockerfile"
| -rw-r--r-- | docker/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 176c109e8..af3f8ecd9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -122,16 +122,16 @@ RUN cd ${REPOS_DIR}/barometer \ RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \ -not -path "*tests/unit*" \ -not -path "*functest_venv*" \ - |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 && - find ${FUNCTEST_REPO_DIR} -name "*.sh" \ + |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 \ + && find ${FUNCTEST_REPO_DIR} -name "*.sh" \ -not -path "*functest_venv*" \ |xargs grep -L \#\! |cut -d\: -f 1 |xargs chmod -c 644 RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \ -not -path "*tests/unit*" \ -not -path "*functest_venv*" \ - |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 && - find ${FUNCTEST_REPO_DIR} -name "*.sh" \ + |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \ + && find ${FUNCTEST_REPO_DIR} -name "*.sh" \ -not -path "*functest_venv*" \ |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755 |