From ce302a1322a7ed3042401825b480cfe2ddd05d88 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 13 Aug 2019 23:10:24 +0300 Subject: [PATCH] Added --no-network flag for build packages purge operation in Alpine images --- agent/alpine/Dockerfile | 2 +- java-gateway/alpine/Dockerfile | 2 +- proxy-mysql/alpine/Dockerfile | 2 +- proxy-sqlite3/alpine/Dockerfile | 2 +- server-mysql/alpine/Dockerfile | 2 +- server-pgsql/alpine/Dockerfile | 2 +- snmptraps/alpine/Dockerfile | 2 +- web-apache-mysql/alpine/Dockerfile | 2 +- web-apache-pgsql/alpine/Dockerfile | 2 +- web-nginx-mysql/alpine/Dockerfile | 2 +- web-nginx-pgsql/alpine/Dockerfile | 2 +- zabbix-appliance/alpine/Dockerfile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 0edc58730..d1ebef552 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux && \ cp /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 30677915c..cb07cfba2 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -73,7 +73,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 \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 2d6fa37dc..40f8b5aec 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -119,7 +119,7 @@ RUN set -eux && \ cp database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index cddc33bbd..9ef5c56ec 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -115,7 +115,7 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 2760f7e29..93779d239 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -126,7 +126,7 @@ RUN set -eux && \ cp database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 62ed482bd..1eb20f371 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -126,7 +126,7 @@ RUN set -eux && \ cp database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index 26b088088..5972249bc 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux && \ "/etc/snmp/snmptrapfmt.conf" && \ rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \ rm -rf /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 901a28dc1..10b05b6a1 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -78,7 +78,7 @@ RUN set -eux && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index f1eff44c8..da0f14c87 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index fb148cf83..be8c36450 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 3216f761f..167b24ebe 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -78,7 +78,7 @@ RUN set -eux && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index 549611097..13e3a5034 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -166,7 +166,7 @@ RUN set -eux && \ ./locale/make_mo.sh && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - apk del ${APK_FLAGS_COMMON} --purge \ + apk del ${APK_FLAGS_COMMON} --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/*