diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 14:27:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 14:27:13 +0000 |
| commit | be9a8789a698b45f9eb423c599fc603b80472bc9 (patch) | |
| tree | 0689a24a8738d770a1269f7da9c0a74005a11097 /docker/heat | |
| parent | 29642a8fcaebef4e60edfda040a0bf83e1d1f3a0 (diff) | |
| parent | 58eee09c15dea81ec51bb366af23681de70ceaa1 (diff) | |
| download | kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.tar.gz kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.zip | |
Merge "use static uid/gid in images"
Diffstat (limited to 'docker/heat')
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 01b898e9b..6a0a73f36 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='heat') }} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -18,18 +20,16 @@ MAINTAINER {{ maintainer }} ADD heat-base-archive /heat-base-source RUN ln -s heat-base-source/* heat \ - && useradd --user-group heat \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /heat \ - && mkdir -p /etc/heat /home/heat \ + && mkdir -p /etc/heat \ && cp -r /heat/etc/heat/* /etc/heat/ \ - && chown -R heat: /etc/heat /home/heat + && chown -R heat: /etc/heat {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla heat \ - && touch /usr/local/bin/kolla_heat_extend_start \ +RUN touch /usr/local/bin/kolla_heat_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start {% block heat_base_footer %}{% endblock %} |