Preparing for Official relases

java-gateway/alpine/Dockerfile

@@ -1,36 +1,24 @@
 FROM alpine:3.10
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
-ARG VCS_REF
-
-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
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-alpine" \
-      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"
+LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \
+      org.opencontainers.image.licenses="GPL v2.0"
 
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    addgroup zabbix && \
+    addgroup -S -g 1000 zabbix && \
     adduser -S \
             -D -G zabbix \
+            -u 999 \
             -h /var/lib/zabbix/ \
         zabbix && \
     mkdir -p /etc/zabbix/ && \
     chown --quiet -R zabbix:root /etc/zabbix && \
-    apk update && \
-    apk add ${APK_FLAGS_COMMON} \
+    apk add --clean-protected --no-cache \
             bash \
             openjdk8-jre-base && \
     rm -rf /var/cache/apk/*
@@ -38,20 +26,24 @@ RUN set -eux && \
 ARG MAJOR_VERSION=4.4
 ARG ZBX_VERSION=${MAJOR_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" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE} --link zabbix-server:zabbix-server -p 10052:10052 -d zabbix-${ZBX_TYPE}:alpine-${ZBX_VERSION}"
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
-    apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
+    apk add --no-cache --virtual build-dependencies \
             autoconf \
             automake \
             coreutils \
-            openjdk8 \
-            alpine-sdk && \
+            pkgconf \
+            git \
+            g++ \
+            make \
+            openjdk8 && \
     cd /tmp/ && \
     git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
@@ -73,7 +65,7 @@ RUN set -eux && \
     rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
     cd /tmp/ && \
     rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    apk del ${APK_FLAGS_COMMON} --purge --no-network \
+    apk del --purge --no-network \
             build-dependencies && \
     rm -rf /var/cache/apk/*
 
@@ -88,3 +80,7 @@ COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+USER zabbix
+
+CMD ["/usr/sbin/zabbix_java_gateway"]