aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-03-25 15:25:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-25 15:25:09 +0000
commit18745da8f335fe3049ffdd5acdafb5848981a1c9 (patch)
tree16dcbf80346c4f8e64c9758e20fcd6e08907fa8f /docker
parent034e9297da1e9fdf82cf900776dddf252e879d29 (diff)
parent00e5ce2316317c2b29a7608eee8d95e73eee2dba (diff)
Merge "Fix Dockerfile.aarch64"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.aarch648
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 60f72a29..17bf0002 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -114,16 +114,16 @@ RUN cd ${RELENG_MODULE_DIR} \
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