extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-07-03 00:01:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'trunk' into master"

Browse Source 
This reverts commit 78b62d9ce5, reversing
changes made to f4e4c3f70f.
This commit is contained in:
root
2018-02-17 10:38:49 -08:00
parent 78b62d9ce5
commit 8f39e80b6f
25 changed files with 82 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web-nginx-mysql/alpine/Dockerfile
View File

@ -50,9 +50,9 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

4
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -58,9 +58,9 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \