From d84b943fbb605441db3f34defb0c4e8bcb37c24c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 26 Dec 2024 15:55:14 +0900 Subject: [PATCH] Merge env variables for standard locations --- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 4 ++-- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 5cc93c478..259b01687 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -21,7 +21,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with MySQL dat maintainer="alexey.pustovalov@zabbix.com" \ name="zabbix/zabbix-web-mysql" \ 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-70:${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-72:${ZBX_VERSION}" \ summary="Zabbix web-interface based on Nginx web server with MySQL database support" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -32,7 +32,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-70:${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-72:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-web-mysql-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index d673f465e..27577964b 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -21,7 +21,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ maintainer="alexey.pustovalov@zabbix.com" \ name="zabbix/zabbix-web-pgsql" \ release="${RELEASE}" \ - run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-70:${ZBX_VERSION}" \ + run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-72:${ZBX_VERSION}" \ summary="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -32,7 +32,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ io.openshift.tags="zabbix,zabbix-web,pgsql,nginx" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-70:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-72:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-web-pgsql-rhel" \ org.label-schema.schema-version="1.0" \