mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-14 10:48:35 +02:00
Merge various changes with Zabbix 7.2 branch
This commit is contained in:
2
.github/workflows/images_build.yml
vendored
2
.github/workflows/images_build.yml
vendored
@ -645,8 +645,8 @@ jobs:
|
||||
with:
|
||||
context: ${{ format('{0}/{1}/{2}/', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
|
||||
build-contexts: |
|
||||
config_templates=./config_templates/
|
||||
sources=./sources/
|
||||
config_templates=./config_templates/
|
||||
file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
|
||||
platforms: ${{ steps.platform.outputs.list }}
|
||||
push: true
|
||||
|
2
.github/workflows/images_build_rhel.yml
vendored
2
.github/workflows/images_build_rhel.yml
vendored
@ -412,8 +412,8 @@ jobs:
|
||||
build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }}
|
||||
extra-args: |
|
||||
--iidfile=${{ github.workspace }}/iidfile
|
||||
--build-context config_templates=./config_templates/
|
||||
--build-context sources=./sources/
|
||||
--build-context config_templates=./config_templates/
|
||||
|
||||
- name: Prepare image metadata
|
||||
id: image_metadata
|
||||
|
2
.github/workflows/scorecard.yml
vendored
2
.github/workflows/scorecard.yml
vendored
@ -13,7 +13,7 @@ on:
|
||||
- cron: '39 3 * * 2'
|
||||
push:
|
||||
branches:
|
||||
- '7.0'
|
||||
- '7.2'
|
||||
|
||||
# Declare default permissions as read only.
|
||||
permissions: read-all
|
||||
|
4
.github/workflows/sonarcloud.yml
vendored
4
.github/workflows/sonarcloud.yml
vendored
@ -30,9 +30,9 @@ name: SonarCloud analysis
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "7.0" ]
|
||||
branches: [ "7.2" ]
|
||||
pull_request:
|
||||
branches: [ "7.0" ]
|
||||
branches: [ "7.2" ]
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
|
Reference in New Issue
Block a user