mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-06-21 02:17:46 +02:00
Merge various changes with Zabbix 7.2 branch
This commit is contained in:
parent
8257994171
commit
11fbb299b5
2
.github/workflows/images_build.yml
vendored
2
.github/workflows/images_build.yml
vendored
@ -645,8 +645,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: ${{ format('{0}/{1}/{2}/', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
|
context: ${{ format('{0}/{1}/{2}/', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
|
||||||
build-contexts: |
|
build-contexts: |
|
||||||
config_templates=./config_templates/
|
|
||||||
sources=./sources/
|
sources=./sources/
|
||||||
|
config_templates=./config_templates/
|
||||||
file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
|
file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
|
||||||
platforms: ${{ steps.platform.outputs.list }}
|
platforms: ${{ steps.platform.outputs.list }}
|
||||||
push: true
|
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 }}
|
build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }}
|
||||||
extra-args: |
|
extra-args: |
|
||||||
--iidfile=${{ github.workspace }}/iidfile
|
--iidfile=${{ github.workspace }}/iidfile
|
||||||
--build-context config_templates=./config_templates/
|
|
||||||
--build-context sources=./sources/
|
--build-context sources=./sources/
|
||||||
|
--build-context config_templates=./config_templates/
|
||||||
|
|
||||||
- name: Prepare image metadata
|
- name: Prepare image metadata
|
||||||
id: 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'
|
- cron: '39 3 * * 2'
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- '7.0'
|
- '7.2'
|
||||||
|
|
||||||
# Declare default permissions as read only.
|
# Declare default permissions as read only.
|
||||||
permissions: read-all
|
permissions: read-all
|
||||||
|
4
.github/workflows/sonarcloud.yml
vendored
4
.github/workflows/sonarcloud.yml
vendored
@ -30,9 +30,9 @@ name: SonarCloud analysis
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "7.0" ]
|
branches: [ "7.2" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "7.0" ]
|
branches: [ "7.2" ]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
|
@ -45,14 +45,9 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
|
|||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
<<<<<<< HEAD
|
--mount=from=sources,target=/tmp/src \
|
||||||
--mount=type=bind,source=src/,target=/tmp/src \
|
|
||||||
--mount=type=bind,source=patches/,target=/tmp/patches \
|
--mount=type=bind,source=patches/,target=/tmp/patches \
|
||||||
--mount=from=config_templates,target=/tmp/conf \
|
--mount=from=config_templates,target=/tmp/conf \
|
||||||
=======
|
|
||||||
--mount=from=sources,target=/tmp/src \
|
|
||||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
|
||||||
>>>>>>> b0f7df6f6 (Move sources directory and introduce additional build context)
|
|
||||||
set -eux && \
|
set -eux && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
|
mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
|
||||||
|
@ -179,7 +179,6 @@ check_variables_postgresql() {
|
|||||||
if [ -n "${DB_SERVER_HOST}" ]; then
|
if [ -n "${DB_SERVER_HOST}" ]; then
|
||||||
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
||||||
else
|
else
|
||||||
DB_SERVER_HOST='""'
|
|
||||||
psql_connect_args="--port ${DB_SERVER_PORT}"
|
psql_connect_args="--port ${DB_SERVER_PORT}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,6 @@ check_variables_postgresql() {
|
|||||||
if [ -n "${DB_SERVER_HOST}" ]; then
|
if [ -n "${DB_SERVER_HOST}" ]; then
|
||||||
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
||||||
else
|
else
|
||||||
DB_SERVER_HOST='""'
|
|
||||||
psql_connect_args="--port ${DB_SERVER_PORT}"
|
psql_connect_args="--port ${DB_SERVER_PORT}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,6 @@ check_variables_postgresql() {
|
|||||||
if [ -n "${DB_SERVER_HOST}" ]; then
|
if [ -n "${DB_SERVER_HOST}" ]; then
|
||||||
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
||||||
else
|
else
|
||||||
DB_SERVER_HOST='""'
|
|
||||||
psql_connect_args="--port ${DB_SERVER_PORT}"
|
psql_connect_args="--port ${DB_SERVER_PORT}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,6 @@ check_variables_postgresql() {
|
|||||||
if [ -n "${DB_SERVER_HOST}" ]; then
|
if [ -n "${DB_SERVER_HOST}" ]; then
|
||||||
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
||||||
else
|
else
|
||||||
DB_SERVER_HOST='""'
|
|
||||||
psql_connect_args="--port ${DB_SERVER_PORT}"
|
psql_connect_args="--port ${DB_SERVER_PORT}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,6 @@ check_variables_postgresql() {
|
|||||||
if [ -n "${DB_SERVER_HOST}" ]; then
|
if [ -n "${DB_SERVER_HOST}" ]; then
|
||||||
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
|
||||||
else
|
else
|
||||||
DB_SERVER_HOST='""'
|
|
||||||
psql_connect_args="--port ${DB_SERVER_PORT}"
|
psql_connect_args="--port ${DB_SERVER_PORT}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -96,6 +96,7 @@ services:
|
|||||||
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro
|
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro
|
||||||
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro
|
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro
|
||||||
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro
|
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro
|
||||||
|
# - pgsql_socket:/var/run/postgresql
|
||||||
command: init_db_only
|
command: init_db_only
|
||||||
env_file:
|
env_file:
|
||||||
- ${ENV_VARS_DIRECTORY}/.env_db_pgsql
|
- ${ENV_VARS_DIRECTORY}/.env_db_pgsql
|
||||||
|
Loading…
x
Reference in New Issue
Block a user