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/Dockerfile | |
| parent | e11f4703cec659b1966c306373bf31b5088c64ac (diff) | |
| parent | 86071d2aba0ff35e7bee19ad6fedf93ae4546521 (diff) | |
Merge "Add fix for Molecule Docker"
Diffstat (limited to 'ansible/test/molecule-docker/Dockerfile')
| -rw-r--r-- | ansible/test/molecule-docker/Dockerfile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/test/molecule-docker/Dockerfile b/ansible/test/molecule-docker/Dockerfile index e4207f2e..61817317 100644 --- a/ansible/test/molecule-docker/Dockerfile +++ b/ansible/test/molecule-docker/Dockerfile @@ -3,6 +3,7 @@ FROM quay.io/ansible/molecule:2.20 ARG USER_ID ARG GROUP_ID ARG DOCKER_GROUP_ID +ARG DOCKER_USER # When user/group provided, create user to have matching ids (for the host user) # to avoid this docker writing files as root owned @@ -10,11 +11,12 @@ RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \ # shadow needed for addgroup # sshpass needed for accessing docker_host (localhost) with ssh and without password prompt apk --no-cache add shadow sshpass && \ - addgroup -g ${GROUP_ID} molecule && \ - adduser -D -u ${USER_ID} -G molecule molecule && \ + addgroup -g ${GROUP_ID} ${DOCKER_USER} && \ + adduser -D -u ${USER_ID} -G ${DOCKER_USER} ${DOCKER_USER} && \ # Add user to same docker group as in docker_host to be able to use docker driver as sudo groupadd docker-host -g ${DOCKER_GROUP_ID} && \ - usermod -aG ${DOCKER_GROUP_ID} molecule \ + usermod -aG ${DOCKER_GROUP_ID} ${DOCKER_USER} \ ;fi -USER molecule +USER ${DOCKER_USER} + |