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

Remove orphaned information about SVN

Browse Source
This commit is contained in:
Alexey Pustovalov 2019-07-13 03:54:05 +03:00
parent 1852d8f2b7
commit 0231258f53
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zabbix-appliance/rhel/Dockerfile
View File

@ -14,12 +14,7 @@ ARG VCS_REF
ARG MAJOR_VERSION=4.0 ARG MAJOR_VERSION=4.0
ARG RELEASE=0 ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE} ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE}
<<<<<<< HEAD
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
=======
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
>>>>>>> master
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL name="zabbix/zabbix-appliance" \ LABEL name="zabbix/zabbix-appliance" \