From ea9d5cd067d379344122d98615df39ef9b4d266d Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 12 Nov 2015 14:34:09 +0000 Subject: Move USER operation after footer The USER operation affects all docker commands after it. This causes a problem with our {{ include_footer }} implementation since commands in that footer may require elevated permissions to perform. In the current implementation I can no longer remove my proxy settings once the USER has been changed. Change-Id: I9b2bab5a15f595f6d52a46c64ddf59ba5608b938 Partially-Implements: blueprint drop-root --- docker/glance/glance-api/Dockerfile.j2 | 4 ++-- docker/glance/glance-registry/Dockerfile.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index bde6d4bed..f60a43c3b 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -4,6 +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 }} + +USER glance diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index c3bdef8d8..5c02dadab 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -USER glance - {{ include_footer }} + +USER glance -- cgit v1.2.3