From 73a39db326107212780fb3b4555b768269fc5c3f Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 22 Sep 2016 00:01:27 +0800
Subject: [PATCH] Fix permission for /var/log/kolla folder
Docker will change the name volume folder permission to image already
set. /var/log/kolla is not created and well configured in image.
This patch set creates and configures proper permission /var/log/kolla
in base image.
This patch set also fixed the ceph image by adding ceph user to kolla
group.
TrivialFix
Change-Id: Ib5ef0187e90de2699b3cda31e819b4babb07e0af
---
docker/base/Dockerfile.j2 | 3 +++
docker/ceph/ceph-base/Dockerfile.j2 | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index ff00365dbd..57ea6e9d98 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -282,6 +282,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 19c9c6f809..f868cc247f 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 %}
--
GitLab