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/heat/heat-api-cfn/Dockerfile.j2 | 4 ++-- docker/heat/heat-api/Dockerfile.j2 | 4 ++-- docker/heat/heat-engine/Dockerfile.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/heat') diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 658b6aa28..1489e8f2e 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -10,6 +10,6 @@ RUN yum -y install openstack-heat-api-cfn \ {% endif %} {% endif %} -USER heat - {{ include_footer }} + +USER heat diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 026d8fc59..080947faa 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -13,6 +13,6 @@ RUN yum -y install openstack-heat-api \ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start -USER heat - {{ include_footer }} + +USER heat diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 7dcf0735c..841dfda6c 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -15,6 +15,6 @@ RUN yum -y install \ {% endif %} {% endif %} -USER heat - {{ include_footer }} + +USER heat -- cgit v1.2.3