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/chrony | |
| 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/chrony')
| -rw-r--r-- | docker/chrony/Dockerfile.j2 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 index 8443bcc4e..d845b5001 100644 --- a/docker/chrony/Dockerfile.j2 +++ b/docker/chrony/Dockerfile.j2 @@ -5,18 +5,14 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% set chrony_packages = ['chrony'] %} +{{ macros.configure_user(name='chrony') }} -{% if base_distro in ['ubuntu', 'debian'] %} -# Ubuntu use _chrony username to use unified running user with RHEL system -RUN useradd --user-group --create-home --home-dir /var/lib/chrony chrony -{% endif %} +{% set chrony_packages = ['chrony'] %} {{ macros.install_packages(chrony_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && usermod -a -G kolla chrony +RUN chmod 755 /usr/local/bin/kolla_extend_start {% block chrony_footer %}{% endblock %} {% block footer %}{% endblock %} |