From 66bfaabe51c6449b1dd8904913d0ee8901c4efad Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 18 Jul 2019 15:38:17 +0300 Subject: [PATCH 1/3] Changed default variables in compose files --- .env_db_mysql | 3 --- .env_db_pgsql | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.env_db_mysql b/.env_db_mysql index b99a8d009..b9f0d2afb 100644 --- a/.env_db_mysql +++ b/.env_db_mysql @@ -1,13 +1,10 @@ # DB_SERVER_HOST=mysql-server # DB_SERVER_PORT=3306 # MYSQL_USER=zabbix -# MYSQL_USER=zabbix MYSQL_USER_FILE=/run/secrets/MYSQL_USER # MYSQL_PASSWORD=zabbix -# MYSQL_PASSWORD=zabbix MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD # MYSQL_ROOT_PASSWORD= -# MYSQL_ROOT_PASSWORD=root_pwd MYSQL_ROOT_PASSWORD_FILE=/run/secrets/MYSQL_ROOT_PASSWORD # MYSQL_ALLOW_EMPTY_PASSWORD=false # MYSQL_DATABASE=zabbix diff --git a/.env_db_pgsql b/.env_db_pgsql index e9916f98a..fee649c67 100644 --- a/.env_db_pgsql +++ b/.env_db_pgsql @@ -1,11 +1,9 @@ # DB_SERVER_HOST=postgres-server # DB_SERVER_PORT=5432 # POSTGRES_USER=zabbix -POSTGRES_USER=zabbix -# POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER +POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER # POSTGRES_PASSWORD=zabbix -POSTGRES_PASSWORD=zabbix -# POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD +POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD # POSTGRES_DB=zabbix POSTGRES_DB=zabbix # DB_SERVER_SCHEMA=public From e45dbaa02698dae152e95e4aed457cf59598f9f7 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 13 Aug 2019 19:54:40 +0300 Subject: [PATCH 2/3] Added generate-stackbrew-library script for Docker official images --- generate-stackbrew-library.sh | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 generate-stackbrew-library.sh diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh new file mode 100755 index 000000000..cb3291ba8 --- /dev/null +++ b/generate-stackbrew-library.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +set -eu + +declare -a -r versions=( 3.0.28 4.0.11 4.2.5 ) + +self="${BASH_SOURCE##*/}" + +# get the most recent commit which modified any of "$@" +fileCommit() { + git log -1 --format='format:%H' HEAD -- "$@" +} + +# prints "$2$1$3$1...$N" +join() { + local sep="$1"; shift + local out; printf -v out "${sep//%/%%}%s" "$@" + echo "${out#$sep}" +} + +cat <<-EOH +# this file is generated via https://github.com/zabbix/zabbix-docker/blob/$(fileCommit "$self")/$self + +Maintainers: Alexey Pustovalov (@dotneft) +GitRepo: https://github.com/zabbix/zabbix-docker.git +EOH + +for version in "${versions[@]}"; do + major_version=${version%.*} + commit=`git rev-list -n 1 "$version"` + + for component in agent java-gateway proxy-{mysql,sqlite3} server-{mysql,pgsql} web-{apache,nginx}-{mysql,pgsql}; do + for variant in alpine; do + dir="${component}/${variant}" + [ -f "$dir/Dockerfile" ] || continue + + variantArches=( amd64 ) + + echo + cat <<-EOE + Tags: $version-$component, $major_version-$component + Architectures: $(join ', ' "${variantArches[@]}") + GitCommit: $commit + GitFetch: refs/heads/$major_version + Directory: $dir + EOE + done + done +done From ce302a1322a7ed3042401825b480cfe2ddd05d88 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 13 Aug 2019 23:10:24 +0300 Subject: [PATCH 3/3] 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/*