From a8661deac6cdc566f5e3174af2d52a464e8c4ee0 Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Mon, 30 Nov 2015 10:30:37 +0530 Subject: Drop root for cinder Updates to ensure commands run in the cinder containers are done as the 'cinder' user rather than root. Change-Id: Ibbe04e3a92195dfb957fa56f762c60a80dbe30ca Partially-Implements: blueprint drop-root --- docker/cinder/cinder-api/Dockerfile.j2 | 2 ++ docker/cinder/cinder-api/extend_start.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/cinder/cinder-api') diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index f6092aa9f..e0769302c 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-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 cinder diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index e9a38ac0f..176515189 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -4,6 +4,6 @@ set -o errexit # 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 cinder cinder-manage db sync + cinder-manage db sync exit 0 fi -- cgit v1.2.3