aboutsummaryrefslogtreecommitdiff
path: root/docker/mariadb
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-22 08:46:55 +0000
committerGerrit Code Review <review@openstack.org>2022-04-22 08:46:55 +0000
commit7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch)
tree0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/mariadb
parent8650c57c12498c483445536af5b5a85ada87791e (diff)
parente21aeb5ae955671937055baf57836120af8d4312 (diff)
downloadkolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz
kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip
Merge "flatten images a bit"
Diffstat (limited to 'docker/mariadb')
-rw-r--r--docker/mariadb/mariadb-server/Dockerfile.j27
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb/mariadb-server/Dockerfile.j2
index 5418158f6..0251bbf38 100644
--- a/docker/mariadb/mariadb-server/Dockerfile.j2
+++ b/docker/mariadb/mariadb-server/Dockerfile.j2
@@ -39,8 +39,10 @@ RUN ln -s /usr/lib64/galera-4 /usr/lib64/galera
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
+COPY backup.sh /usr/local/bin/kolla_mariadb_backup.sh
+
RUN chmod 644 /usr/local/bin/kolla_extend_start \
- && chmod 755 /usr/local/bin/kolla_security_reset \
+ && chmod 755 /usr/local/bin/kolla_security_reset /usr/local/bin/kolla_mariadb_backup.sh \
&& chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \
&& rm -rf /var/lib/mysql/*
@@ -49,9 +51,6 @@ RUN chmod 644 /usr/local/bin/kolla_extend_start \
RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld
{% endif %}
-COPY backup.sh /usr/local/bin/kolla_mariadb_backup.sh
-RUN chmod 755 /usr/local/bin/kolla_mariadb_backup.sh
-
{% if docker_healthchecks %}
{% block healthcheck_installation %}