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/barbican | |
| 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/barbican')
| -rw-r--r-- | docker/barbican/barbican-base/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 5f44432bf..6892d5303 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='barbican') }} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set barbican_base_packages = ['openstack-barbican-common'] %} @@ -25,19 +27,17 @@ MAINTAINER {{ maintainer }} ADD barbican-base-archive /barbican-base-source RUN ln -s barbican-base-source/* barbican \ - && useradd --user-group barbican \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pastedeploy uwsgi MySQL-python python-barbicanclient /barbican \ - && mkdir -p /etc/barbican /var/log/barbican /home/barbican /var/lib/barbican \ + && mkdir -p /etc/barbican /var/log/barbican \ && cp -r /barbican/etc/barbican/* /etc/barbican/ \ - && chown -R barbican: /etc/barbican /var/log/barbican /home/barbican /var/lib/barbican + && chown -R barbican: /etc/barbican /var/log/barbican {% endif %} COPY barbican_sudoers /etc/sudoers.d/kolla_barbican_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla barbican \ - && chmod 750 /etc/sudoers.d \ +RUN chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_barbican_sudoers \ && touch /usr/local/bin/kolla_barbican_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_barbican_extend_start |
