mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-01-22 05:18:37 +01:00
Merge remote-tracking branch 'origin/master' into 3.0
This commit is contained in:
commit
cf963c7a03
@ -31,7 +31,7 @@ LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
|||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VCS_REF
|
ARG VCS_REF
|
||||||
|
|
||||||
ARG YUM_FLAGS_COMMON="--quiet -y"
|
ARG YUM_FLAGS_COMMON="-y"
|
||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.0
|
ARG MAJOR_VERSION=3.0
|
||||||
|
@ -32,7 +32,7 @@ LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
|||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VCS_REF
|
ARG VCS_REF
|
||||||
|
|
||||||
ARG YUM_FLAGS_COMMON="--quiet -y"
|
ARG YUM_FLAGS_COMMON="-y"
|
||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.0
|
ARG MAJOR_VERSION=3.0
|
||||||
|
@ -81,7 +81,7 @@ LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
|||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VCS_REF
|
ARG VCS_REF
|
||||||
|
|
||||||
ARG YUM_FLAGS_COMMON="--quiet -y"
|
ARG YUM_FLAGS_COMMON="-y"
|
||||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.0
|
ARG MAJOR_VERSION=3.0
|
||||||
|
Loading…
Reference in New Issue
Block a user