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/mariadb | |
| 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/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index d36504894..05a9710a7 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -37,7 +37,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ && chmod 440 /etc/sudoers.d/mariadb_sudoers \ && usermod -a -G kolla mysql +{{ include_footer }} USER mysql - -{{ include_footer }} |