diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2017-03-22 18:03:45 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2017-03-22 18:03:45 +0100 |
| commit | 089fb510271465f915e4b3a929653a9299989f96 (patch) | |
| tree | f0b667392a235ad62b6fd83017f567f0cc752f0c /docker | |
| parent | 52df520334dde18aa6b2773b44ce6157e21f7dc5 (diff) | |
Fix Dockerfile
Bugfix for error:
https://build.opnfv.org/ci/job/functest-docker-build-push-master/1001/console
Change-Id: I4bc398ecfaa5163e7ee271dd5b67b3d953fb59b1
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'docker')
| -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 |