aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-08 15:23:43 +0000
committerGerrit Code Review <review@openstack.org>2018-03-08 15:23:43 +0000
commit553a51bdbc9a715c25c1ac6f1c26771f5b975b22 (patch)
tree5b31655ac909a1baf93a5ed9afa547f8488c0250 /docker
parent4c58d99c2760e3d00fc35a9c0ec69d258f86d62c (diff)
parent60e1c4b34135bade149bcad80da15113a329848e (diff)
downloadkolla-553a51bdbc9a715c25c1ac6f1c26771f5b975b22.tar.gz
kolla-553a51bdbc9a715c25c1ac6f1c26771f5b975b22.zip
Merge "mariadb: create /var/run/mysqld under Debian distros"
Diffstat (limited to 'docker')
-rw-r--r--docker/mariadb/Dockerfile.j23
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 86e083d89..6af2bfb6c 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -55,10 +55,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& 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 %}