summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile.aarch64
diff options
context:
space:
mode:
authorCedric Ollivier <ollivier.cedric@gmail.com>2017-03-22 08:53:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-22 08:53:23 +0000
commit7cf1acd21aa2f21c0cc4f8b0f6ac60404edc5f15 (patch)
tree14d3f0bed2385480a3a8ad27be865ee8aac90c8d /docker/Dockerfile.aarch64
parent2426e4f43aa7bc69ea8e1b9052d724ca7b57ade7 (diff)
parent5a011b40ff772271a6f7055ce8005ea6c9f331a0 (diff)
Merge changes from topics '644', 'improve_unix_permission_check'
* changes: Change execute bits Improve unix permissions fixes
Diffstat (limited to 'docker/Dockerfile.aarch64')
-rw-r--r--docker/Dockerfile.aarch6416
1 files changed, 14 insertions, 2 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 15f0bdc3a..60f72a297 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -112,8 +112,20 @@ RUN cd ${RELENG_MODULE_DIR} \
&& 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 \
- && find ${FUNCTEST_REPO_DIR} -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
+ -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" \
+ -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" \
+ -not -path "*functest_venv*" \
+ |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
RUN ${REPOS_DIR}/rally/install_rally.sh --yes