Skip to content

Commit 8534e1b

Browse files
committed
chore: set Zabbix version tags in Dockerfiles
1 parent a84e942 commit 8534e1b

File tree

94 files changed

+152
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+152
-152
lines changed

Dockerfiles/agent/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=alpine:3.22
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent/centos/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent/ol/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=oraclelinux:9-slim
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent/rhel/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
33
ARG MAJOR_VERSION=7.4
44
ARG RELEASE=0
5-
ARG ZBX_VERSION=${MAJOR_VERSION}
5+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
66
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
77

88
FROM ${BUILD_BASE_IMAGE} AS builder
@@ -24,9 +24,9 @@ ENV ZBX_LOADMODULEPATH="${ZABBIX_USER_HOME_DIR}/modules" \
2424

2525
LABEL description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \
2626
maintainer="[email protected]" \
27-
name="zabbix/zabbix-agent-trunk" \
27+
name="zabbix/zabbix-agent-74" \
2828
release="${RELEASE}" \
29-
run="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-trunk:${ZBX_VERSION}" \
29+
run="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-74:${ZBX_VERSION}" \
3030
summary="Zabbix agent" \
3131
url="https://www.zabbix.com/" \
3232
vendor="Zabbix SIA" \
@@ -37,7 +37,7 @@ LABEL description="Zabbix agent is deployed on a monitoring target to actively m
3737
io.openshift.tags="zabbix,zabbix-agent" \
3838
org.label-schema.build-date="${BUILD_DATE}" \
3939
org.label-schema.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \
40-
org.label-schema.docker.cmd="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-trunk:${ZBX_VERSION}" \
40+
org.label-schema.docker.cmd="podman run --name zabbix-agent -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-74:${ZBX_VERSION}" \
4141
org.label-schema.license="AGPL v3.0" \
4242
org.label-schema.name="zabbix-agent-rhel" \
4343
org.label-schema.schema-version="1.0" \

Dockerfiles/agent/ubuntu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=ubuntu:noble
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG OS_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022
44

55
ARG MAJOR_VERSION=7.4
6-
ARG ZBX_VERSION=${MAJOR_VERSION}
6+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
77

88
ARG BUILD_BASE_IMAGE=zabbix-build-agent:ltsc2022-agent-${ZBX_VERSION}
99

Dockerfiles/agent2/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=alpine:3.22
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent2/centos/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent2/ol/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
ARG OS_BASE_IMAGE=oraclelinux:9-slim
33
ARG MAJOR_VERSION=7.4
4-
ARG ZBX_VERSION=${MAJOR_VERSION}
4+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
55
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ol-${ZBX_VERSION}
66

77
FROM ${BUILD_BASE_IMAGE} AS builder

Dockerfiles/agent2/rhel/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
33
ARG MAJOR_VERSION=7.4
44
ARG RELEASE=0
5-
ARG ZBX_VERSION=${MAJOR_VERSION}
5+
ARG ZBX_VERSION=${MAJOR_VERSION}.0
66
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
77

88
FROM ${BUILD_BASE_IMAGE} AS builder
@@ -24,9 +24,9 @@ ENV ZBX_PERSISTENTBUFFERFILE="$ZABBIX_USER_HOME_DIR/buffer/agent2.db" \
2424

2525
LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \
2626
maintainer="[email protected]" \
27-
name="zabbix/zabbix-agent2-trunk" \
27+
name="zabbix/zabbix-agent2-74" \
2828
release="${RELEASE}" \
29-
run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-trunk:${ZBX_VERSION}" \
29+
run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION}" \
3030
summary="Zabbix agent" \
3131
url="https://www.zabbix.com/" \
3232
vendor="Zabbix SIA" \
@@ -37,7 +37,7 @@ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively
3737
io.openshift.tags="zabbix,zabbix-agent" \
3838
org.label-schema.build-date="${BUILD_DATE}" \
3939
org.label-schema.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \
40-
org.label-schema.docker.cmd="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-trunk:${ZBX_VERSION}" \
40+
org.label-schema.docker.cmd="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION}" \
4141
org.label-schema.license="AGPL v3.0" \
4242
org.label-schema.name="zabbix-agent2-rhel" \
4343
org.label-schema.schema-version="1.0" \

0 commit comments

Comments
 (0)