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

3.2.0beta1

Browse Source
This commit is contained in:
dotneft 2016-08-23 12:51:31 -07:00
parent c68ec611bf
commit c582276b5a
19 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/Dockerfile
View File

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

2
agent/ubuntu/Dockerfile
View File

@ -31,7 +31,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.0alpha2 ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

2
java-gateway/alpine/Dockerfile
View File

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

2
java-gateway/ubuntu/Dockerfile
View File

@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.0alpha2 ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

2
proxy-mysql/alpine/Dockerfile
View File

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

2
proxy-mysql/ubuntu/Dockerfile
View File

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

2
proxy-sqlite3/alpine/Dockerfile
View File

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

2
proxy-sqlite3/ubuntu/Dockerfile
View File

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

2
server-mysql/alpine/Dockerfile
View File

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

2
server-mysql/ubuntu/Dockerfile
View File

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

2
server-pgsql/alpine/Dockerfile
View File

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

2
server-pgsql/ubuntu/Dockerfile
View File

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

28
update_ver.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/bash
set -e
new_version=$1
major_version=$(echo $new_version | cut -d'.' -f 1,2)
minor_version=$(echo $new_version | cut -d'.' -f 3)
echo "Using $major_version.$minor_version version of Zabbix"
find ./ -type d | while read DIR; do
if [ -d "$DIR" ] && [ -f "$DIR/run_zabbix_component.sh" ] && [ -f "$DIR/Dockerfile" ]; then
echo "** Updating $DIR/Dockerfile"
if [ "$is_trunk" == "true" ]; then
sed -i -e "/^ARG MAJOR_VERSION=/s/=.*/=$major_version/" $DIR/Dockerfile
sed -i -e "/^ARG ZBX_VERSION=/s/=.*/=\${MAJOR_VERSION}/" $DIR/Dockerfile
sed -i -e "/^ARG ZBX_SOURCES=/s/=.*/=svn:\/\/svn.zabbix.com\/trunk\//" $DIR/Dockerfile
else
sed -i -e "/^ARG MAJOR_VERSION=/s/=.*/=$major_version/" $DIR/Dockerfile
[ "$new_version" == "master" ] || sed -i -e "/^ARG ZBX_VERSION=/s/=.*/=\${MAJOR_VERSION}.$minor_version/" $DIR/Dockerfile
[ "$new_version" == "master" ] && sed -i -e "/^ARG ZBX_VERSION=/s/=.*/=\${MAJOR_VERSION}/" $DIR/Dockerfile
sed -i -e "/^ARG ZBX_SOURCES=/s/=.*/=svn:\/\/svn.zabbix.com\/tags\/\${ZBX_VERSION}\//" $DIR/Dockerfile
fi
fi
done
exit 0

2
web-apache-mysql/alpine/Dockerfile
View File

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

2
web-apache-mysql/ubuntu/Dockerfile
View File

@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.0alpha2 ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

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

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

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

@ -42,7 +42,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.0alpha2 ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

2
web-nginx-pgsql/alpine/Dockerfile
View File

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

2
web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -42,7 +42,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.0alpha2 ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}