diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-09 18:04:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-09 18:04:47 +0000 |
| commit | 610604e4b3071a54e9bc02e0b5d0b9e135c327a8 (patch) | |
| tree | bd1b5d0b2a8112f0e7317593c2430c4cfd0c5d73 /docker | |
| parent | cb578df3b0eb442bed2b6d938eb28848104fbd44 (diff) | |
| parent | bd9e8c22d79f28d1bc74eeaa4f7f8563a8e9da6d (diff) | |
| download | kolla-610604e4b3071a54e9bc02e0b5d0b9e135c327a8.tar.gz kolla-610604e4b3071a54e9bc02e0b5d0b9e135c327a8.zip | |
Merge "drop root for glance"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/glance/glance-registry/Dockerfile.j2 | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 2e1aec4cd..bde6d4bed 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start +USER glance + {{ include_footer }} diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh index fd70962eb..6f3cab830 100644 --- a/docker/glance/glance-api/extend_start.sh +++ b/docker/glance/glance-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 glance glance-manage db_sync + glance-manage db_sync exit 0 fi diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 5ce5397bc..447c2d5b9 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -43,3 +43,5 @@ RUN ln -s glance-base-source/* glance \ && chown -R glance: /etc/glance /var/log/glance /home/glance {% endif %} + +RUN usermod -a -G kolla glance diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index 54710da06..c3bdef8d8 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -1,4 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) +USER glance + {{ include_footer }} |