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

Updated all Dockerfiles to make consistency

Browse Source
This commit is contained in:
root
2018-05-31 19:02:46 -07:00
parent 73859060cc 112890eadd
commit f06c11f91a
37 changed files with 435 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java-gateway/alpine/Dockerfile
View File

@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
ARG VCS_REF
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
ARG APK_FLAGS_COMMON=""
ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
ENV TERM=xterm PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-alpine" \
org.label-schema.vcs-ref="${VCS_REF}" \
org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.schema-version="1.0" \
org.label-schema.license="GPL 2.0"
org.label-schema.license="GPL v2.0"
STOPSIGNAL SIGTERM
@ -52,12 +52,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
subversion \
alpine-sdk && \
cd /tmp/ && \
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
./bootstrap.sh 1>/dev/null && \
./bootstrap.sh && \
./configure \
--datadir=/usr/lib \
--libdir=/usr/lib/zabbix \
@ -65,7 +65,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--prefix=/usr \
--enable-java \
--silent && \
make -j"$(nproc)" -s 1>/dev/null && \
make -j"$(nproc)" -s && \
mkdir -p /usr/sbin/zabbix_java/ && \
cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \
cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \