diff options
| author | Kevin Zhao <kevin.zhao@arm.com> | 2017-11-20 11:27:29 +0800 |
|---|---|---|
| committer | Kevin Zhao <kevin.zhao@arm.com> | 2017-12-05 15:33:03 +0800 |
| commit | 7192508e3652e98f25fa9ccfe098935b52a4e57d (patch) | |
| tree | 8da69b91160d9f081668dba823481b81897bc006 /docker | |
| parent | 568f131ab6be29b8814ce802535ccceea4e2fd6b (diff) | |
| download | kolla-7192508e3652e98f25fa9ccfe098935b52a4e57d.tar.gz kolla-7192508e3652e98f25fa9ccfe098935b52a4e57d.zip | |
Creates directory /var/run/mysqld on aarch64 when building MariaDB docker image
Closes-bug: #1733262
Change-Id: I2d0a3422ba6a077a309c1fe967a2a62ef5ce6a36
Signed-off-by: Kevin Zhao <kevin.zhao@arm.com>
Diffstat (limited to 'docker')
| -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 %} |