mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-21 23:33:31 +01:00
Added PostgreSQL for RHEL
This commit is contained in:
parent
e72a0b9c0e
commit
297af37407
@ -1,7 +1,7 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
ARG MAJOR_VERSION=7.0
|
||||
ARG RELEASE=0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG MAJOR_VERSION=6.4
|
||||
ARG RELEASE=12
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.12
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-base:rhel-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
@ -10,11 +10,10 @@ ARG MAJOR_VERSION
|
||||
ARG RELEASE
|
||||
ARG ZBX_VERSION
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ARG GIT_BRANCH=master
|
||||
|
||||
LABEL description="Zabbix build base for PostgreSQL based images" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
name="zabbix/zabbix-build-pgsql-trunk" \
|
||||
name="zabbix/zabbix-build-pgsql-64" \
|
||||
release="${RELEASE}" \
|
||||
summary="Zabbix build base (PostgreSQL)" \
|
||||
url="https://www.zabbix.com/" \
|
||||
@ -30,15 +29,15 @@ LABEL description="Zabbix build base for PostgreSQL based images" \
|
||||
org.label-schema.vcs-ref="${VCS_REF}" \
|
||||
org.label-schema.vendor="Zabbix LLC"
|
||||
|
||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=master \
|
||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master
|
||||
ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_VERSION} \
|
||||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_VERSION}
|
||||
|
||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||
--mount=type=cache,target=/root/go/ \
|
||||
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
|
||||
set -eux && \
|
||||
cd /tmp/ && \
|
||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
|
||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||
patch -p1 < /tmp/chromedp_no_sandbox.patch && \
|
||||
zabbix_revision=`git rev-parse --short HEAD` && \
|
||||
|
@ -1,7 +1,7 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
ARG MAJOR_VERSION=7.0
|
||||
ARG RELEASE=0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG MAJOR_VERSION=6.4
|
||||
ARG RELEASE=12
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.12
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
@ -20,9 +20,9 @@ ENV TERM=xterm \
|
||||
|
||||
LABEL description="Zabbix server with PostgreSQL database support" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
name="zabbix/zabbix-server-pgsql-trunk" \
|
||||
name="zabbix/zabbix-server-pgsql-64" \
|
||||
release="${RELEASE}" \
|
||||
run="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-trunk:${ZBX_VERSION}" \
|
||||
run="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-64:${ZBX_VERSION}" \
|
||||
summary="Zabbix server (PostgreSQL)" \
|
||||
url="https://www.zabbix.com/" \
|
||||
vendor="Zabbix LLC" \
|
||||
@ -33,7 +33,7 @@ LABEL description="Zabbix server with PostgreSQL database support" \
|
||||
io.openshift.tags="zabbix,zabbix-server,pgsql" \
|
||||
org.label-schema.build-date="${BUILD_DATE}" \
|
||||
org.label-schema.description="Zabbix server with PostgreSQL database support" \
|
||||
org.label-schema.docker.cmd="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-trunk:${ZBX_VERSION}" \
|
||||
org.label-schema.docker.cmd="docker run --name zabbix-server --link postgresql:pgsql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-server-pgsql-64:${ZBX_VERSION}" \
|
||||
org.label-schema.license="GPL v2.0" \
|
||||
org.label-schema.name="zabbix-server-pgsql-rhel" \
|
||||
org.label-schema.schema-version="1.0" \
|
||||
|
@ -1,7 +1,7 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
ARG MAJOR_VERSION=7.0
|
||||
ARG RELEASE=0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG MAJOR_VERSION=6.4
|
||||
ARG RELEASE=12
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.12
|
||||
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION}
|
||||
|
||||
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||
@ -20,7 +20,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-trunk:${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-64:${ZBX_VERSION}" \
|
||||
summary="Zabbix web-interface based on Nginx web server with PostgreSQL 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 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-trunk:${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-64:${ZBX_VERSION}" \
|
||||
org.label-schema.license="GPL v2.0" \
|
||||
org.label-schema.name="zabbix-web-pgsql-rhel" \
|
||||
org.label-schema.schema-version="1.0" \
|
||||
|
Loading…
Reference in New Issue
Block a user