Fixed small issues. Preparation for Appliance

This commit is contained in:
root 2018-03-30 02:04:04 -07:00
parent beae98e524
commit 37df41f2f0
33 changed files with 36 additions and 36 deletions

View File

@ -40,7 +40,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -40,7 +40,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -41,7 +41,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -35,7 +35,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -35,7 +35,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -40,7 +40,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -57,7 +57,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -56,7 +56,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -65,7 +65,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -55,7 +55,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -55,7 +55,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -62,7 +62,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -59,7 +59,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -60,7 +60,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -67,7 +67,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -59,7 +59,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -61,7 +61,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -67,7 +67,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -51,7 +51,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -45,7 +45,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -48,7 +48,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -50,7 +50,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -46,7 +46,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -48,7 +48,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -51,7 +51,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -50,7 +50,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -60,7 +60,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -50,7 +50,7 @@ RUN addgroup zabbix && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -49,7 +49,7 @@ RUN groupadd --system zabbix && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

@ -60,7 +60,7 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.10
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

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

View File

@ -74,8 +74,8 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

View File

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