diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-03 16:55:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-03 16:55:48 +0000 |
| commit | af6c80db016c73086af07100cdff556eb79553c3 (patch) | |
| tree | 53ee4f1aa9abe1f6992f7577eba88c3a866d448f /docker | |
| parent | 6f2fbe933ecc40bd4ef1156be5f945acec91febc (diff) | |
| parent | 2a491b9896ac68314429387517d737f426f2d042 (diff) | |
| download | kolla-af6c80db016c73086af07100cdff556eb79553c3.tar.gz kolla-af6c80db016c73086af07100cdff556eb79553c3.zip | |
Merge "Drop root for murano"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/murano/murano-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index a64fec6b1..1074ecce8 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -5,3 +5,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} + +USER murano diff --git a/docker/murano/murano-api/extend_start.sh b/docker/murano/murano-api/extend_start.sh index 4ca50b6c9..d46b2b0af 100644 --- a/docker/murano/murano-api/extend_start.sh +++ b/docker/murano/murano-api/extend_start.sh @@ -3,6 +3,6 @@ # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - sudo -H -u murano murano-db-manage --config-file /etc/murano/murano.conf upgrade + murano-db-manage --config-file /etc/murano/murano.conf upgrade exit 0 fi diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 344c16ad8..67eb6266c 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -12,3 +12,5 @@ RUN ln -s murano-base-source/* murano \ && chown -R murano: /etc/murano /var/log/murano /home/murano {% endif %} + +RUN usermod -a -G kolla murano diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 36d714e79..4c0d9da66 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -2,3 +2,5 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} MAINTAINER {{ maintainer }} {{ include_footer }} + +USER murano |