aboutsummaryrefslogtreecommitdiff
path: root/docker/heat/heat-api
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-11-12 14:34:09 +0000
committerSam Yaple <sam@yaple.net>2015-11-12 14:34:09 +0000
commitea9d5cd067d379344122d98615df39ef9b4d266d (patch)
treeb652863dda53e13cb6876fed5768553b68336eef /docker/heat/heat-api
parent55e4b54e23e96f0baae0fc49817a25152843d36c (diff)
downloadkolla-ea9d5cd067d379344122d98615df39ef9b4d266d.tar.gz
kolla-ea9d5cd067d379344122d98615df39ef9b4d266d.zip
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
Diffstat (limited to 'docker/heat/heat-api')
-rw-r--r--docker/heat/heat-api/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
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