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/heka | |
| 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/heka')
| -rw-r--r-- | docker/heka/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2 index 142bd2e0e..1756849fb 100644 --- a/docker/heka/Dockerfile.j2 +++ b/docker/heka/Dockerfile.j2 @@ -5,12 +5,13 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='heka', homedir='/var/cache/hekad') }} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set heka_packages = [ 'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm' ] %} -RUN useradd --user-group heka \ - && mkdir /etc/heka +RUN mkdir /etc/heka {% elif base_distro in ['ubuntu', 'debian'] %} {% set heka_packages = [ @@ -27,8 +28,7 @@ COPY plugins/encoders /usr/share/heka/lua_encoders/ COPY heka_sudoers /etc/sudoers.d/kolla_heka_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla heka \ - && chmod 440 /etc/sudoers.d/kolla_heka_sudoers \ +RUN chmod 440 /etc/sudoers.d/kolla_heka_sudoers \ && chmod 755 /usr/local/bin/kolla_extend_start \ && chown -R heka: /usr/share/heka /etc/heka |