mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-01-05 21:29:17 +01:00
3.2.0beta2
This commit is contained in:
parent
9454a7ce1d
commit
5aff895c42
@ -26,7 +26,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
|
@ -31,7 +31,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
|
@ -22,7 +22,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
|
@ -28,7 +28,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
|
@ -44,7 +44,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -40,7 +40,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -47,7 +47,7 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -45,7 +45,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -50,7 +50,7 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -45,7 +45,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -50,7 +50,7 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -1,28 +0,0 @@
|
||||
#!/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
|
@ -38,7 +38,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -37,7 +37,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -37,7 +37,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -42,7 +42,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -36,7 +36,7 @@ RUN addgroup zabbix && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -42,7 +42,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.2
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta1
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.0beta2
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user