diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-18 00:50:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-18 00:50:40 +0000 |
| commit | 3e97fdf4d81c3c936c3ef91df92c4d5fb9c5ae27 (patch) | |
| tree | eb354872249bc6bad077a6a6b767be5854539a7e /docker/magnum | |
| parent | e63c0458f5d76f37c404baab3dbd810cad8fc8fd (diff) | |
| parent | 1a536124ada8645d2fa1abb3c8c898afb531847e (diff) | |
| download | kolla-3e97fdf4d81c3c936c3ef91df92c4d5fb9c5ae27.tar.gz kolla-3e97fdf4d81c3c936c3ef91df92c4d5fb9c5ae27.zip | |
Merge "Drop root for Magnum"
Diffstat (limited to 'docker/magnum')
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index 3a613ab34..f1264f5df 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -14,3 +14,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} + +USER magnum diff --git a/docker/magnum/magnum-api/extend_start.sh b/docker/magnum/magnum-api/extend_start.sh index f6db67556..0f92f6e7b 100644 --- a/docker/magnum/magnum-api/extend_start.sh +++ b/docker/magnum/magnum-api/extend_start.sh @@ -3,6 +3,6 @@ # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - sudo -H -u magnum magnum-db-manage upgrade + magnum-db-manage upgrade exit 0 fi diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 4e9eaef43..e31e46f99 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -16,3 +16,5 @@ RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/release {% endif %} {{ include_footer }} + +USER magnum |