From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Wed, 22 Mar 2017 17:03:45 +0000 (+0100)
Subject: Fix Dockerfile
X-Git-Tag: opnfv-5.0.RC1~552^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F31399%2F1;p=functest.git

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>
---

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