extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-10 23:59:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor design changes

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-10-17 02:42:29 +03:00
parent 4d13676760
commit 4ce42a7d6b
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/build-mysql/rhel/Dockerfile
View File

@ -80,5 +80,3 @@ RUN set -eux && \
strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \
strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service

1
Dockerfiles/proxy-mysql/rhel/Dockerfile
View File

@ -3,7 +3,6 @@ ARG MAJOR_VERSION=6.0
ARG RELEASE= ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder

1
Dockerfiles/proxy-sqlite3/rhel/Dockerfile
View File

@ -3,7 +3,6 @@ ARG MAJOR_VERSION=6.0
ARG RELEASE= ARG RELEASE=
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION}
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
FROM ${BUILD_BASE_IMAGE} as builder FROM ${BUILD_BASE_IMAGE} as builder

28
Dockerfiles/web-service/rhel/Dockerfile
View File

@ -16,31 +16,31 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \ ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL name="zabbix/zabbix-web-service-trunk" \ LABEL description="Zabbix web service for performing various tasks using headless web browser" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
name="zabbix/zabbix-web-service-trunk" \
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}" \
summary="Zabbix web service" \
url="https://www.zabbix.com/" \
vendor="Zabbix LLC" \ vendor="Zabbix LLC" \
version="${MAJOR_VERSION}" \ version="${MAJOR_VERSION}" \
release="${RELEASE}" \
summary="Zabbix web service" \
description="Zabbix web service for performing various tasks using headless web browser" \
url="https://www.zabbix.com/" \
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}" \
io.k8s.description="Zabbix web service for performing various tasks using headless web browser" \ io.k8s.description="Zabbix web service for performing various tasks using headless web browser" \
io.k8s.display-name="Zabbix web service" \ io.k8s.display-name="Zabbix web service" \
io.openshift.expose-services="10053:10053" \ io.openshift.expose-services="10053:10053" \
io.openshift.tags="zabbix,zabbix-web-service" \ io.openshift.tags="zabbix,zabbix-web-service" \
org.label-schema.name="zabbix-web-service-rhel" \
org.label-schema.vendor="Zabbix LLC" \
org.label-schema.url="https://zabbix.com/" \
org.label-schema.description="Zabbix web service for performing various tasks using headless web browser" \
org.label-schema.vcs-ref="${VCS_REF}" \
org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.schema-version="1.0" \ 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.license="GPL v2.0" \ org.label-schema.license="GPL v2.0" \
org.label-schema.name="zabbix-web-service-rhel" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://zabbix.com/" \
org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
org.label-schema.version="${ZBX_VERSION}" \ org.label-schema.vcs-ref="${VCS_REF}" \
org.label-schema.vcs-url="${ZBX_SOURCES}" \ org.label-schema.vcs-url="${ZBX_SOURCES}" \
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.vendor="Zabbix LLC" \
org.label-schema.version="${ZBX_VERSION}"
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM