diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-24 17:17:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-24 17:17:27 +0000 |
| commit | 42c8fec79c9e180f517ffc334a758873287ff560 (patch) | |
| tree | 94f2c9b0706b5e60c921bf8899059477eefcd8a8 | |
| parent | 365236570a04634662fdadbeb2768ac735807249 (diff) | |
| parent | 44251da0c606a087daf19daafe2aa5144cd20045 (diff) | |
| download | kolla-42c8fec79c9e180f517ffc334a758873287ff560.tar.gz kolla-42c8fec79c9e180f517ffc334a758873287ff560.zip | |
Merge "Drop root for ironic"
| -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 |