diff options
| author | Sam Yaple <sam@yaple.net> | 2015-11-12 14:34:09 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-11-12 14:34:09 +0000 |
| commit | ea9d5cd067d379344122d98615df39ef9b4d266d (patch) | |
| tree | b652863dda53e13cb6876fed5768553b68336eef /docker/designate | |
| parent | 55e4b54e23e96f0baae0fc49817a25152843d36c (diff) | |
| download | kolla-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/designate')
6 files changed, 12 insertions, 12 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 4bb3b8319..c162d41dd 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -14,6 +14,6 @@ RUN yum install -y \ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start -USER designate - {{ include_footer }} + +USER designate diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index b7c734442..422d7780c 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -12,6 +12,6 @@ RUN yum install -y bind \ {% endif %} {% endif %} -USER designate - {{ include_footer }} + +USER designate diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 8a9526dc0..d1807692b 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -10,6 +10,6 @@ RUN yum install -y openstack-designate-central \ {% endif %} {% endif %} -USER designate - {{ include_footer }} + +USER designate diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index be9341e12..39bd60bd5 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -10,6 +10,6 @@ RUN yum install -y openstack-designate-mdns \ {% endif %} {% endif %} -USER designate - {{ include_footer }} + +USER designate diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 index 25fc8f7e4..6fbc52606 100644 --- a/docker/designate/designate-poolmanager/Dockerfile.j2 +++ b/docker/designate/designate-poolmanager/Dockerfile.j2 @@ -13,6 +13,6 @@ RUN yum install -y \ {% endif %} {% endif %} -USER designate - {{ include_footer }} + +USER designate diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 1d059ea6f..be6566177 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -12,6 +12,6 @@ RUN yum install -y \ {% endif %} {% endif %} -USER designate - {{ include_footer }} + +USER designate |