diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-22 09:33:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-22 09:33:06 +0000 |
| commit | b5630840dd1c392e084d333d0f95fa0c3503e252 (patch) | |
| tree | b950c1554ff2d7d6e698579a028540bd89ca6db4 | |
| parent | 9d7ba661f3a1f5de4cff06d531025319f7342712 (diff) | |
| parent | 73a39db326107212780fb3b4555b768269fc5c3f (diff) | |
| download | kolla-b5630840dd1c392e084d333d0f95fa0c3503e252.tar.gz kolla-b5630840dd1c392e084d333d0f95fa0c3503e252.zip | |
Merge "Fix permission for /var/log/kolla folder"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index afd463471..34133d104 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -281,6 +281,9 @@ RUN touch /usr/local/bin/kolla_extend_start \ && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs \ && chmod 440 /etc/sudoers \ && groupadd kolla \ + && mkdir -p /var/log/kolla \ + && chown :kolla /var/log/kolla \ + && chmod 2775 /var/log/kolla \ && rm -f /tmp/kolla_bashrc \ && curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 -o /usr/local/bin/dumb-init \ && chmod +x /usr/local/bin/dumb-init diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 19c9c6f80..f868cc247 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -25,7 +25,8 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(ceph_base_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && usermod -a -G kolla ceph {% block ceph_base_footer %}{% endblock %} {% block footer %}{% endblock %} |