diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-04-19 15:46:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-19 15:46:18 +0000 |
| commit | 37f8f68fd83cc062cc57b72a0da580f186b5152b (patch) | |
| tree | c2dc3e70e5817eb8bf6508c85d5f70bd9f5f69ac /ansible/test/molecule-docker/build.sh | |
| parent | e11f4703cec659b1966c306373bf31b5088c64ac (diff) | |
| parent | 86071d2aba0ff35e7bee19ad6fedf93ae4546521 (diff) | |
Merge "Add fix for Molecule Docker"
Diffstat (limited to 'ansible/test/molecule-docker/build.sh')
| -rwxr-xr-x | ansible/test/molecule-docker/build.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ansible/test/molecule-docker/build.sh b/ansible/test/molecule-docker/build.sh index 0b65f2a7..b613e466 100755 --- a/ansible/test/molecule-docker/build.sh +++ b/ansible/test/molecule-docker/build.sh @@ -20,6 +20,7 @@ SCRIPT_DIR=$(dirname "${0}") LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") +if [ $(id -u ${USER}) -eq "0" ]; then DOCKER_USER="root"; else DOCKER_USER="molecule"; fi set -e @@ -27,6 +28,7 @@ docker build \ --build-arg USER_ID=$(id -u ${USER}) \ --build-arg GROUP_ID=$(id -g ${USER}) \ --build-arg DOCKER_GROUP_ID=$(getent group docker | cut -f 3 -d ':') \ + --build-arg DOCKER_USER=${DOCKER_USER} \ -t molecule-dev:2.20.0 \ ${LOCAL_PATH} |