diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2015-11-24 20:52:01 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2015-11-24 21:28:38 +0530 |
| commit | 44251da0c606a087daf19daafe2aa5144cd20045 (patch) | |
| tree | e5f21e773c4f4fa7c161e3f890425c508b912b64 /docker | |
| parent | e61b917bb8f46158fe1244b48d8e7ce5e2b19760 (diff) | |
| download | kolla-44251da0c606a087daf19daafe2aa5144cd20045.tar.gz kolla-44251da0c606a087daf19daafe2aa5144cd20045.zip | |
Drop root for ironic
Updates to ensure commands run in the ironic containers
are done as the 'ironic' user rather than root.
Change-Id: I491041ce02fb5dd3eb60c6ae9169f26d8a8919dd
Partially-Implements: blueprint drop-root
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-discoverd/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 2 |
6 files changed, 11 insertions, 1 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 1e39d847d..211b42f57 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-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 ironic diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh index b7ef2b242..cd9c95a12 100644 --- a/docker/ironic/ironic-api/extend_start.sh +++ b/docker/ironic/ironic-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 ironic ironic-dbsync upgrade + ironic-dbsync upgrade exit 0 fi diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index a0fb01d60..109afed56 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -26,3 +26,5 @@ RUN ln -s ironic-base-source/* ironic \ && chown -R ironic: /etc/ironic /var/log/ironic /home/ironic {% endif %} + +RUN usermod -a -G kolla ironic diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 7b56f5d35..340a13000 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -11,3 +11,5 @@ RUN yum -y install openstack-ironic-conductor \ {% endif %} {{ include_footer }} + +USER ironic diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2 index 8bde9d89b..536d2b878 100644 --- a/docker/ironic/ironic-discoverd/Dockerfile.j2 +++ b/docker/ironic/ironic-discoverd/Dockerfile.j2 @@ -14,3 +14,5 @@ RUN pip install ironic-discoverd {% endif %} {{ include_footer }} + +USER ironic diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index b550be051..fd19748bf 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -25,3 +25,5 @@ RUN apt-get install -y --no-install-recommends \ COPY tftp-map-file /tftpboot/map-file {{ include_footer }} + +USER ironic |