mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-09 00:24:58 +02:00
Migrate to GIT
This commit is contained in:
@ -57,7 +57,7 @@ RUN addgroup zabbix && \
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||
@ -69,9 +69,12 @@ ADD conf/tmp/font-config /tmp/font-config
|
||||
|
||||
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||
gettext \
|
||||
subversion && \
|
||||
git && \
|
||||
cd /usr/share/ && \
|
||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
||||
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
|
||||
mkdir /usr/share/zabbix/ && \
|
||||
cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
|
||||
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
|
||||
cd /usr/share/zabbix/ && \
|
||||
patch -p3 < /tmp/font-config && \
|
||||
rm /tmp/font-config && \
|
||||
@ -82,8 +85,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||
ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
||||
apk del ${APK_FLAGS_COMMON} --purge \
|
||||
build-dependencies && \
|
||||
rm -rf /var/cache/apk/* && \
|
||||
rm -rf /root/.subversion
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
EXPOSE 80/TCP 443/TCP
|
||||
|
||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
||||
@ -14,9 +14,12 @@ RUN yum --quiet makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install \
|
||||
gettext \
|
||||
patch \
|
||||
subversion && \
|
||||
git && \
|
||||
cd /tmp/ && \
|
||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
||||
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
|
||||
mkdir /tmp/zabbix/ && \
|
||||
cp -R /tmp/zabbix-${ZBX_VERSION}/frontends/php/* /tmp/zabbix/ && \
|
||||
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||
cd /tmp/zabbix/ && \
|
||||
patch -p3 < /tmp/font-config && \
|
||||
rm /tmp/font-config && \
|
||||
@ -36,7 +39,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache
|
||||
|
||||
|
@ -55,7 +55,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||
@ -69,9 +69,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||
apt-get ${APT_FLAGS_DEV} install \
|
||||
gettext \
|
||||
patch \
|
||||
subversion && \
|
||||
ca-certificates \
|
||||
git && \
|
||||
cd /usr/share/ && \
|
||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
||||
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
|
||||
mkdir /usr/share/zabbix/ && \
|
||||
cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
|
||||
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
|
||||
cd /usr/share/zabbix/ && \
|
||||
patch -p3 < /tmp/font-config && \
|
||||
rm /tmp/font-config && \
|
||||
@ -92,11 +96,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||
apt-get ${APT_FLAGS_COMMON} purge \
|
||||
gettext \
|
||||
patch \
|
||||
subversion && \
|
||||
ca-certificates \
|
||||
git && \
|
||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
rm -rf /root/.subversion
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
EXPOSE 80/TCP 443/TCP
|
||||
|
||||
|
Reference in New Issue
Block a user