Fixed CentOS images building

2025-08-09 16:45:05 +02:00 · 2018-05-26 06:48:52 -07:00
parent 465f2957e5 32e02d831f
commit e7afdd9bf8
13 changed files with 788 additions and 792 deletions
--- a/java-gateway/centos/Dockerfile
+++ b/java-gateway/centos/Dockerfile
@ -1,48 +1,14 @@
-FROM centos:centos7
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
-
-ARG BUILD_DATE
-ARG VCS_REF
+FROM centos:centos7 as builder

 ARG YUM_FLAGS_COMMON="--quiet -y"
-ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}"
 ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
-ENV TERM=xterm \
-    ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
-      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 2.0"
-
-STOPSIGNAL SIGTERM
-
-RUN groupadd --system zabbix && \
-    adduser --system --shell /sbin/nologin \
-            -g zabbix \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix/ && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTANT} install \
-            java-1.8.0-openjdk-headless && \
-    yum ${YUM_FLAGS_PERSISTANT} clean all && \
-    rm -rf /var/cache/yum/
-
+    
 ARG MAJOR_VERSION=3.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.17
 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-${ZBX_TYPE} --link zabbix-server:zabbix-server -p 10052:10052 -d zabbix-${ZBX_TYPE}:centos-${ZBX_VERSION}"
+ENV TERM=xterm \
+    ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

 RUN yum --quiet makecache && \
    yum ${YUM_FLAGS_DEV} install \
@ -67,20 +33,54 @@ RUN yum --quiet makecache && \
            --enable-java \
            --silent && \
    make -j"$(nproc)" -s 1>/dev/null && \
+    rm -rf src/zabbix_java/lib/*.xml
+
+FROM centos:centos7
+LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+ARG YUM_FLAGS_COMMON="--quiet -y"
+ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}"
+ARG MAJOR_VERSION=3.0
+ARG ZBX_VERSION=${MAJOR_VERSION}.17
+ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
+ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+ENV TERM=xterm \
+    ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
+
+LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
+      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 2.0" \
+      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}:centos-${ZBX_VERSION}"
+
+STOPSIGNAL SIGTERM
+
+RUN groupadd --system zabbix && \
+    adduser --system --shell /sbin/nologin \
+            -g zabbix \
+            -d /var/lib/zabbix/ \
+        zabbix && \
+    mkdir -p /etc/zabbix/ && \
+    chown --quiet -R zabbix:root /etc/zabbix && \
    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}/ && \
-    yum ${YUM_FLAGS_COMMON} history undo `yum history | sed -n 4p |column -t | cut -d' ' -f1` 1>/dev/null && \
-    yum ${YUM_FLAGS_COMMON} clean all && \
-    rm -rf /var/cache/yum && \
-    rm -rf /var/lib/yum/yumdb/* && \
-    rm -rf /usr/lib/udev/hwdb.d/* && \
-    rm -rf /etc/udev/hwdb.bin && \
-    rm -rf /root/.pki && \
-    rm -rf /root/.subversion
+    yum ${YUM_FLAGS_COMMON} makecache && \
+    yum ${YUM_FLAGS_PERSISTANT} install \
+            java-1.8.0-openjdk-headless && \
+    yum ${YUM_FLAGS_PERSISTANT} clean all && \
+    rm -rf /var/cache/yum/
+
+COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/* /usr/sbin/zabbix_java/bin/
+COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/* /usr/sbin/zabbix_java/lib/

 EXPOSE 10052/TCP