Merge various changes with Zabbix 7.2 branch

This commit is contained in:
Alexey Pustovalov 2024-12-25 01:34:43 +09:00
parent 11fbb299b5
commit 91825e34a4
8 changed files with 19 additions and 19 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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: