diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-05 10:37:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-05 10:37:13 +0000 |
| commit | 0c8956ecf3d92c5a0c5ae10e7e4767e78dd210f9 (patch) | |
| tree | 826dc11d8285efe9d7b60dfa07b7f0816c7d96b7 | |
| parent | 939b464d12d0ae12087a46c828f6db42dc94225c (diff) | |
| parent | a8661deac6cdc566f5e3174af2d52a464e8c4ee0 (diff) | |
| download | kolla-0c8956ecf3d92c5a0c5ae10e7e4767e78dd210f9.tar.gz kolla-0c8956ecf3d92c5a0c5ae10e7e4767e78dd210f9.zip | |
Merge "Drop root for cinder"
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-scheduler/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
6 files changed, 11 insertions, 1 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index f6092aa9f..e0769302c 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -14,3 +14,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} + +USER cinder diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index e9a38ac0f..176515189 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -4,6 +4,6 @@ set -o errexit # 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 cinder cinder-manage db sync + cinder-manage db sync exit 0 fi diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index f0541f59b..054982359 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -2,3 +2,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER {{ maintainer }} {{ include_footer }} + +USER cinder diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 9adae372a..fce75009a 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -37,3 +37,5 @@ RUN ln -s cinder-base-source/* cinder \ && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder {% endif %} + +RUN usermod -a -G kolla cinder diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index f0541f59b..054982359 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -2,3 +2,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER {{ maintainer }} {{ include_footer }} + +USER cinder diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index c922e73f2..e3aef3fc2 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -13,3 +13,5 @@ RUN yum install -y \ {% endif %} {{ include_footer }} + +USER cinder |