Merge pull request #231 from stackhpc/upstream/yoga-2023-06-19

Synchronise yoga with upstream

Author: markgoddard

docker/base/apt_preferences.debian

@@ -12,6 +12,11 @@ Package: logstash-oss
 Pin: version 7.9.*
 Pin-Priority: 1000
 
+# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
+Package: td-agent*
+Pin: version 4.4.2-1
+Pin-Priority: 1000
+
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bullseye-backports

docker/base/apt_preferences.ubuntu

@@ -11,3 +11,9 @@ Pin-Priority: 1000
 Package: logstash-oss
 Pin: version 7.9.*
 Pin-Priority: 1000
+
+# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
+Package: td-agent*
+Pin: version 4.4.2-1
+Pin-Priority: 1000
+

docker/fluentd/Dockerfile.j2

@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set fluentd_packages = [
         'gcc-c++',
         'make',
-        'td-agent',
+        'td-agent-4.4.2',
     ] %}
 
 {% elif base_package_type == 'deb' %}

docker/mariadb/mariadb-clustercheck/Dockerfile.j2

@@ -15,5 +15,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% endif %}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN chmod 644 /usr/local/bin/kolla_extend_start
+
 {% block mariadb_clustercheck_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/mariadb/mariadb-clustercheck/extend_start.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+: ${MARIADB_LOG_DIR:=/var/log/kolla/mariadb}
+
+# Create log directory, with appropriate permissions
+if [[ ! -d "${MARIADB_LOG_DIR}" ]]; then
+    mkdir -p ${MARIADB_LOG_DIR}
+fi
+if [[ $(stat -c %a ${MARIADB_LOG_DIR}) != "755" ]]; then
+    chmod 755 ${MARIADB_LOG_DIR}
+fi