From 91825e34a493ca7524bebdc7926623497a56dcce Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 25 Dec 2024 01:34:43 +0900
Subject: [PATCH] Merge various changes with Zabbix 7.2 branch

---
 docker-compose_v3_alpine_mysql_local.yaml | 4 ++--
 docker-compose_v3_alpine_pgsql_local.yaml | 6 +++---
 docker-compose_v3_centos_mysql_local.yaml | 4 ++--
 docker-compose_v3_centos_pgsql_local.yaml | 4 ++--
 docker-compose_v3_ol_mysql_local.yaml     | 4 ++--
 docker-compose_v3_ol_pgsql_local.yaml     | 6 +++---
 docker-compose_v3_ubuntu_mysql_local.yaml | 4 ++--
 docker-compose_v3_ubuntu_pgsql_local.yaml | 6 +++---
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
index bd6f33ae8..4eb041fa4 100644
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@@ -13,8 +13,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -28,8 +28,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml
index 27a362328..0937fdb6f 100644
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@@ -11,8 +11,8 @@ services:
   build:
    context: ./Dockerfiles/build-pgsql/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -26,8 +26,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -43,8 +43,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml
index 2e2bf77a6..4ea53e0f0 100644
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@@ -13,8 +13,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
@@ -28,8 +28,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml
index ab009b715..a37b61168 100644
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@@ -11,8 +11,8 @@ services:
   build:
    context: ./Dockerfiles/build-pgsql/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
@@ -26,8 +26,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml
index 969f9f21d..fe83db5d2 100644
--- a/docker-compose_v3_ol_mysql_local.yaml
+++ b/docker-compose_v3_ol_mysql_local.yaml
@@ -11,8 +11,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -26,8 +26,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml
index e419a3f1e..8f0425439 100644
--- a/docker-compose_v3_ol_pgsql_local.yaml
+++ b/docker-compose_v3_ol_pgsql_local.yaml
@@ -11,8 +11,8 @@ services:
   build:
    context: ./Dockerfiles/build-pgsql/${OL_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -26,8 +26,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -43,8 +43,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml
index 7ce803e85..e1fc58ad4 100644
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@@ -11,8 +11,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -26,8 +26,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml
index d9a768be2..9039e67bf 100644
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@@ -11,8 +11,8 @@ services:
   build:
    context: ./Dockerfiles/build-pgsql/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -26,8 +26,8 @@ services:
   build:
    context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -43,8 +43,8 @@ services:
   build:
    context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
-    - config_templates=./config_templates/
     - sources=./sources/
+    - config_templates=./config_templates/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args: