diff options
| author |   Cedric Ollivier <ollivier.cedric@gmail.com> | 2017-03-22 08:53:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-22 08:53:23 +0000 |
| commit | 7cf1acd21aa2f21c0cc4f8b0f6ac60404edc5f15 (patch) | |
| tree | 14d3f0bed2385480a3a8ad27be865ee8aac90c8d /docker/Dockerfile | |
| parent | 2426e4f43aa7bc69ea8e1b9052d724ca7b57ade7 (diff) | |
| parent | 5a011b40ff772271a6f7055ce8005ea6c9f331a0 (diff) | |
Merge changes from topics '644', 'improve_unix_permission_check'
* changes:
Change execute bits
Improve unix permissions fixes
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 30c31dad..176c109e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -120,8 +120,20 @@ RUN cd ${REPOS_DIR}/barometer \ && pip install . 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 |