From 229dccd17ee17ca13b42b48296a6fb76663a0bf1 Mon Sep 17 00:00:00 2001 From: Kevin Zhao Date: Mon, 20 Nov 2017 11:27:29 +0800 Subject: [PATCH] Creates directory /var/run/mysqld on aarch64 when building MariaDB docker image Closes-bug: #1733262 Change-Id: I2d0a3422ba6a077a309c1fe967a2a62ef5ce6a36 Signed-off-by: Kevin Zhao --- docker/mariadb/Dockerfile.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 7f22e12691..03987b18e8 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 %}