summaryrefslogtreecommitdiff
path: root/docker/mariadb
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-07-02 19:59:44 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-07-05 05:49:13 +0000
commit3f79e37d21f7bda40656da2d9607cb4fe0c2c69a (patch)
tree23d8e75f1501af5dff0dee8208d31881c44b9e3f /docker/mariadb
parent10258f138b283a3c3dc3c873a3aa8149308f1ee7 (diff)
downloadkolla-3f79e37d21f7bda40656da2d9607cb4fe0c2c69a.tar.gz
kolla-3f79e37d21f7bda40656da2d9607cb4fe0c2c69a.zip
Fix the overwrite sudoers file issue
Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98 Closes-Bug: #1598423
Diffstat (limited to 'docker/mariadb')
-rw-r--r--docker/mariadb/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 5fbf4192f..9290b0286 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -29,13 +29,13 @@ RUN apt-get -y install --no-install-recommends \
{% endif %}
-COPY mariadb_sudoers /etc/sudoers.d/mariadb_sudoers
+COPY mariadb_sudoers /etc/sudoers.d/kolla_mariadb_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY security_reset.expect /usr/local/bin/kolla_security_reset
RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_security_reset \
&& chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/mariadb_sudoers \
+ && chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \
&& usermod -a -G kolla mysql
{{ include_footer }}