diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-18 21:01:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-18 21:01:55 +0000 |
| commit | cea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch) | |
| tree | a53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/mariadb | |
| parent | 8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff) | |
| parent | ae1322ec10861678abe1137f3013030b34335bc7 (diff) | |
| download | kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip | |
Merge "Use base_package_type"
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index d63bcb83e..67a1c1d60 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='mysql') }} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} {% set mariadb_packages = [ 'expect', 'galera', @@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'tar' ] %} -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} {% set mariadb_packages = [ 'expect' ] %} @@ -47,7 +47,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ && chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \ && rm -rf /var/lib/mysql/* -{% if base_distro in ['debian', 'ubuntu'] %} +{% if base_package_type == 'deb' %} RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld {% endif %} {% block mariadb_footer %}{% endblock %} |