diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-05 09:51:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-05 09:51:23 +0000 |
| commit | f0c539066f57e9d2ecd67273b96c7880e6c911a2 (patch) | |
| tree | aefbe79513b833fdae9d9687940ecd2644a2e05b | |
| parent | e38683d2123b446c34d869912404b662bd56efa9 (diff) | |
| parent | 7192508e3652e98f25fa9ccfe098935b52a4e57d (diff) | |
| download | kolla-f0c539066f57e9d2ecd67273b96c7880e6c911a2.tar.gz kolla-f0c539066f57e9d2ecd67273b96c7880e6c911a2.zip | |
Merge "Creates directory /var/run/mysqld on aarch64 when building MariaDB docker image"
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 7f22e1269..03987b18e 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -59,6 +59,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {{ macros.install_packages(mariadb_packages | customizable("packages")) }} + 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 @@ -68,6 +69,12 @@ 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_arch == "aarch64" %} +RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld + {% endif %} + +{% endif %} {% block mariadb_footer %}{% endblock %} {% block footer %}{% endblock %} |