diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 67bf23148..42dd1ae5f 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-agent-trunk" \ + name="zabbix/zabbix-agent-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-agent --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-agent --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-60:${ZBX_VERSION}" \ summary="Zabbix agent" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix agent is deployed on a monitoring target to actively m io.openshift.tags="zabbix,zabbix-agent" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \ - org.label-schema.docker.cmd="docker run --name zabbix-agent --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-agent --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-agent-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 2cda83e08..aeaf87d0e 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-agent2-trunk" \ + name="zabbix/zabbix-agent2-60" \ release="${RELEASE}" \ - 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}" \ + run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-60:${ZBX_VERSION}" \ summary="Zabbix agent" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively io.openshift.tags="zabbix,zabbix-agent" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - 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}" \ + 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-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-agent2-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 776a3d12e..044ab4e86 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -11,7 +11,7 @@ ENV TERM=xterm \ LABEL description="Prepared environment to build Zabbix components" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-base-trunk" \ + name="zabbix/zabbix-build-base-60" \ release="${RELEASE}" \ summary="Zabbix build base" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 8a754a0c7..fb95d7d7f 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -13,7 +13,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git LABEL description="Zabbix build base for MySQL based images" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-mysql-trunk" \ + name="zabbix/zabbix-build-mysql-60" \ release="${RELEASE}" \ summary="Zabbix build base (MySQL)" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index dc9c12730..e4b9321c1 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -13,7 +13,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git LABEL description="Zabbix build base for SQLite3 based images" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-sqlite3-trunk" \ + name="zabbix/zabbix-build-sqlite3-60" \ release="${RELEASE}" \ summary="Zabbix build base (SQLite3)" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index eddcba0f9..ee3570eb6 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-java-gateway-trunk" \ + name="zabbix/zabbix-java-gateway-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-60:${ZBX_VERSION}" \ summary="Zabbix Java Gateway" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix Java Gateway performs native support for monitoring JM io.openshift.tags="gateway,zabbix-java,java" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \ - org.label-schema.docker.cmd="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-java-gateway -p 10052:10052 -d registry.connect.redhat.com/zabbix/zabbix-java-gateway-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-java-gateway-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index daf2dac7b..fa781fd7b 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -19,9 +19,9 @@ ENV TERM=xterm \ LABEL description="Zabbix proxy with MySQL database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-proxy-mysql-trunk" \ + name="zabbix/zabbix-proxy-mysql-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-60:${ZBX_VERSION}" \ summary="Zabbix proxy (MySQL)" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -32,7 +32,7 @@ LABEL description="Zabbix proxy with MySQL database support" \ io.openshift.tags="zabbix,zabbix-proxy,mysql" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix proxy with MySQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-proxy-mysql-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 3bf0749ae..a9bfbeb98 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -19,9 +19,9 @@ ENV TERM=xterm \ LABEL description="Zabbix proxy with SQLite3 database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-proxy-sqlite-trunk" \ + name="zabbix/zabbix-proxy-sqlite-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-60:${ZBX_VERSION}" \ summary="Zabbix proxy (SQLite3)" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -32,7 +32,7 @@ LABEL description="Zabbix proxy with SQLite3 database support" \ io.openshift.tags="zabbix,zabbix-proxy,sqlite" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix proxy with SQLite3 database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite3-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite3-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-proxy-sqlite-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index a1d66c2bc..3ee909fe2 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -19,9 +19,9 @@ ENV TERM=xterm \ LABEL description="Zabbix server with MySQL database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-server-mysql-trunk" \ + name="zabbix/zabbix-server-mysql-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-60:${ZBX_VERSION}" \ summary="Zabbix server (MySQL)" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -32,7 +32,7 @@ LABEL description="Zabbix server with MySQL database support" \ io.openshift.tags="zabbix,zabbix-server,mysql" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix server with MySQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-server --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-mysql-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-server-mysql-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 04a6aea3a..7bc4c3c09 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -13,9 +13,9 @@ ENV TERM=xterm \ LABEL description="Zabbix SNMP traps receiver" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-snmptraps-trunk" \ + name="zabbix/zabbix-snmptraps-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-60:${ZBX_VERSION}" \ summary="Zabbix SNMP traps receiver" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -26,7 +26,7 @@ LABEL description="Zabbix SNMP traps receiver" \ io.openshift.tags="zabbix,zabbix-snmp,snmp-traps" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix SNMP traps receiver" \ - org.label-schema.docker.cmd="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:1162/udp -d registry.connect.redhat.com/zabbix/zabbix-snmptraps-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-snmptraps-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index d08c76736..56abf3300 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix web-interface based on Nginx web server with MySQL database support" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-web-mysql" \ + name="zabbix/zabbix-web-mysql-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-60:${ZBX_VERSION}" \ summary="Zabbix web-interface based on Nginx web server with MySQL database support" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with MySQL dat io.openshift.tags="zabbix,zabbix-web,mysql,nginx" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-nginx-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-web-mysql-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index 0b8f3760e..917eb1b64 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -18,9 +18,9 @@ ENV TERM=xterm \ LABEL description="Zabbix web service for performing various tasks using headless web browser" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-web-service-trunk" \ + name="zabbix/zabbix-web-service-60" \ release="${RELEASE}" \ - run="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-60:${ZBX_VERSION}" \ summary="Zabbix web service" \ url="https://www.zabbix.com/" \ vendor="Zabbix LLC" \ @@ -31,7 +31,7 @@ LABEL description="Zabbix web service for performing various tasks using headles io.openshift.tags="zabbix,zabbix-web-service" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix web service for performing various tasks using headless web browser" \ - org.label-schema.docker.cmd="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-web-service --link zabbix-server:zabbix-server -p 10053:10053 -d registry.connect.redhat.com/zabbix/zabbix-web-service-60:${ZBX_VERSION}" \ org.label-schema.license="GPL v2.0" \ org.label-schema.name="zabbix-web-service-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/zabbix-appliance/rhel/Dockerfile b/Dockerfiles/zabbix-appliance/rhel/Dockerfile index cd2e9fcba..66d6c5a40 100644 --- a/Dockerfiles/zabbix-appliance/rhel/Dockerfile +++ b/Dockerfiles/zabbix-appliance/rhel/Dockerfile @@ -17,7 +17,7 @@ LABEL name="zabbix/zabbix-appliance" \ summary="Zabbix appliance with MySQL database support and Nginx web-server" \ description="Zabbix appliance contains MySQL database server, Zabbix server, Zabbix Java Gateway and Zabbix frontend based on Nginx web-server." \ url="https://www.zabbix.com/" \ - run="docker run --name zabbix-appliance -p 80:8080 -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-appliance-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-appliance -p 80:8080 -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-appliance-60:${ZBX_VERSION}" \ io.k8s.description="Zabbix appliance with MySQL database support and Nginx web-server" \ io.k8s.display-name="Zabbix Appliance" \ io.openshift.expose-services="8080:http,8443:https,10051:10051" \ @@ -33,7 +33,7 @@ LABEL name="zabbix/zabbix-appliance" \ org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.label-schema.version="${ZBX_VERSION}" \ org.label-schema.vcs-url="${ZBX_SOURCES}" \ - org.label-schema.docker.cmd="docker run --name zabbix-appliance -p 80:8080 -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-appliance-trunk:${ZBX_VERSION}" + org.label-schema.docker.cmd="docker run --name zabbix-appliance -p 80:8080 -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-appliance-60:${ZBX_VERSION}" STOPSIGNAL SIGTERM