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

Revert "Merge branch '3.4' into master"

Browse Source 
This reverts commit 49a0e5deb7, reversing
changes made to b2bb957389.
This commit is contained in:
root
2018-02-17 10:22:18 -08:00
parent 49a0e5deb7
commit f4e4c3f70f
25 changed files with 81 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

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

@ -58,8 +58,8 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}