The big one update :-)

java-gateway/ubuntu/Dockerfile

@@ -1,15 +1,27 @@
 FROM ubuntu:trusty
-LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+
+ARG BUILD_DATE
+ARG VCS_REF
 
 ARG APT_FLAGS_COMMON="-qq -y"
 ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"
 ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm
 
-RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
-    locale-gen $LC_ALL && \
+LABEL org.label-schema.name="zabbix-java-gateway-ubuntu" \
+      org.label-schema.vendor="Zabbix LLC" \
+      org.label-schema.url="https://zabbix.com/" \
+      org.label-schema.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \
+      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 v2.0"
+
+STOPSIGNAL SIGTERM
+
+RUN locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
-    echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \
     addgroup --system --quiet zabbix && \
     adduser --quiet \
             --system --disabled-login \
@@ -32,15 +44,21 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
+LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.label-schema.version="${ZBX_VERSION}" \
+      org.label-schema.vcs-url="${ZBX_SOURCES}" \
+      org.label-schema.docker.cmd="docker run --name zabbix-java-gateway --link zabbix-server:zabbix-server -p 10052:10052 -d zabbix-java-gateway:ubuntu-${ZBX_VERSION}"
+
 RUN apt-get ${APT_FLAGS_COMMON} update && \
     apt-get ${APT_FLAGS_DEV} install \
-            gcc \
-            make \
+            autoconf \
             automake \
             libc6-dev \
-            pkg-config \
+            make \
             openjdk-7-jdk \
-            subversion 1>/dev/null && \
+            pkg-config \
+            subversion \
+            gcc 1>/dev/null && \
     cd /tmp/ && \
     svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
@@ -49,39 +67,42 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
     sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
     ./bootstrap.sh 1>/dev/null && \
     ./configure \
-            --prefix=/usr \
-            --silent \
-            --sysconfdir=/etc/zabbix \
-            --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
-            --enable-java && \
+            --libdir=/usr/lib/zabbix \
+            --sysconfdir=/etc/zabbix \
+            --prefix=/usr \
+            --enable-java \
+            --silent && \
     make -j"$(nproc)" -s 1>/dev/null && \
     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/ && \
+    rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
     cd /tmp/ && \
     rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
     apt-get ${APT_FLAGS_COMMON} purge \
-            gcc \
-            make \
+            autoconf \
             automake \
             libc6-dev \
-            pkg-config \
+            make \
             openjdk-7-jdk \
-            subversion 1>/dev/null && \
+            pkg-config \
+            subversion \
+            gcc 1>/dev/null && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /root/.subversion
 
 EXPOSE 10052/TCP
 
-WORKDIR /usr/sbin/zabbix_java/
+WORKDIR /var/lib/zabbix
 
-ADD conf/etc/supervisor/ /etc/supervisor/
-ADD conf/etc/zabbix/zabbix_java_gateway_logback.xml /etc/zabbix/
-ADD conf/usr/sbin/zabbix_java_gateway /usr/sbin/
-ADD run_zabbix_component.sh /
+COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
+COPY ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"]
+COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
+COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["docker-entrypoint.sh"]
 
-CMD ["/run_zabbix_component.sh", "java-gateway", "none"]
+CMD ["java-gateway", "none"]