diff options
Diffstat (limited to 'docker/mariadb/Dockerfile.j2')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 55898dc18..7fa09a30d 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -23,19 +23,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set mariadb_packages = [ - 'expect' + 'expect', + 'mariadb-backup', + 'mariadb-client', + 'mariadb-server' ] %} - {% if base_distro == 'debian' %} - {% set mariadb_packages = mariadb_packages + [ - 'mariadb-server' - ] %} - {% else %} - {% set mariadb_packages = mariadb_packages + [ - 'mariadb-server', - 'mariadb-client', - 'mariadb-backup', - ] %} - {% endif %} {% endif %} {{ macros.install_packages(mariadb_packages | customizable("packages")) }} @@ -53,6 +45,9 @@ RUN chmod 755 /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 use_dumb_init %} {% block mariadb_entrypoint %} # NOTE(mgoddard): Override the dumb-init arguments to avoid passing |