openstack/kolla-ansible
Code Issues Proposed changes

Merge "drop root for glance"

Browse Source
This commit is contained in:
Jenkins 2015-11-09 18:04:47 +00:00 committed by Gerrit Code Review
commit 610604e4b3
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/glance/glance-api/Dockerfile.j2
View File

@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
USER glance
{{ include_footer }} {{ include_footer }}

2
docker/glance/glance-api/extend_start.sh
View File

@ -3,6 +3,6 @@
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
sudo -H -u glance glance-manage db_sync glance-manage db_sync
exit 0 exit 0
fi fi

2
docker/glance/glance-base/Dockerfile.j2
View File

@ -43,3 +43,5 @@ RUN ln -s glance-base-source/* glance \
&& chown -R glance: /etc/glance /var/log/glance /home/glance && chown -R glance: /etc/glance /var/log/glance /home/glance
{% endif %} {% endif %}
RUN usermod -a -G kolla glance

2
docker/glance/glance-registry/Dockerfile.j2
View File

@ -1,4 +1,6 @@
FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
USER glance
{{ include_footer }} {{ include_footer }}