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/panko | |
| 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/panko')
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 43f6ce7ce..dd1d217c8 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='panko') }} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -49,20 +51,16 @@ RUN truncate -s 0 /etc/apache2/ports.conf ADD panko-base-archive /panko-base-source RUN ln -s panko-base-source/* panko \ - && useradd --user-group panko \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /panko \ - && mkdir -p /etc/panko /home/panko \ + && mkdir -p /etc/panko \ && cp -r /panko/etc/panko/* /etc/panko/ \ - && chown -R panko: /etc/panko /home/panko + && chown -R panko: /etc/panko {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla panko \ - && mkdir -p /var/lib/panko \ - && chown -R panko: /var/lib/panko \ - && touch /usr/local/bin/kolla_panko_extend_start \ +RUN touch /usr/local/bin/kolla_panko_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_panko_extend_start {% block panko_base_footer %}{% endblock %} |