From 8f39e80b6f7a60a20306de651c8d82c8cf445885 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Feb 2018 10:38:49 -0800 Subject: [PATCH] Revert "Merge branch 'trunk' into master" This reverts commit 78b62d9ce5c8966ba1f31b05bfb2ed32708da2e2, reversing changes made to f4e4c3f70f7c8e745edb6c6598f114644540b789. --- agent/alpine/Dockerfile | 10 +++++----- agent/ubuntu/Dockerfile | 7 ++----- docker-compose_v2_alpine_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_alpine_pgsql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_mysql_latest.yaml | 16 ++++++++-------- docker-compose_v2_ubuntu_pgsql_latest.yaml | 16 ++++++++-------- java-gateway/alpine/Dockerfile | 4 ++-- java-gateway/ubuntu/Dockerfile | 4 ++-- kubernetes.yaml | 14 +++++++------- proxy-mysql/alpine/Dockerfile | 8 ++------ proxy-mysql/ubuntu/Dockerfile | 10 ++-------- proxy-sqlite3/alpine/Dockerfile | 8 ++------ proxy-sqlite3/ubuntu/Dockerfile | 10 ++-------- server-mysql/alpine/Dockerfile | 8 ++------ server-mysql/ubuntu/Dockerfile | 10 ++-------- server-pgsql/alpine/Dockerfile | 8 ++------ server-pgsql/ubuntu/Dockerfile | 10 ++-------- web-apache-mysql/alpine/Dockerfile | 4 ++-- web-apache-mysql/ubuntu/Dockerfile | 4 ++-- web-apache-pgsql/alpine/Dockerfile | 4 ++-- web-apache-pgsql/ubuntu/Dockerfile | 4 ++-- web-nginx-mysql/alpine/Dockerfile | 4 ++-- web-nginx-mysql/ubuntu/Dockerfile | 4 ++-- web-nginx-pgsql/alpine/Dockerfile | 4 ++-- web-nginx-pgsql/ubuntu/Dockerfile | 4 ++-- 25 files changed, 82 insertions(+), 125 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 347ab2b55..72ef3eb21 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -36,13 +36,12 @@ RUN addgroup zabbix && \ bash \ iputils \ libldap \ - pcre \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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" \ @@ -56,8 +55,9 @@ RUN apk update && \ autoconf \ automake \ openssl-dev \ - pcre-dev \ - subversion && \ + openldap-dev \ + subversion \ + coreutils && \ cd /tmp/ && \ svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \ cd /tmp/zabbix-${ZBX_VERSION} && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 5ce59c1cb..dcee51cdb 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -36,15 +36,14 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ - libpcre3 \ supervisor 1>/dev/null && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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" \ @@ -58,7 +57,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ automake \ libc6-dev \ libldap2-dev \ - libpcre3-dev \ libssl-dev \ make \ pkg-config \ @@ -93,7 +91,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ autoconf \ automake \ libc6-dev \ - libpcre3-dev \ libssl-dev \ make \ pkg-config \ diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index 068d45dee..05a65dcb0 100644 --- a/docker-compose_v2_alpine_mysql_latest.yaml +++ b/docker-compose_v2_alpine_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:alpine-trunk + image: zabbix/zabbix-server-mysql:alpine-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + image: zabbix/zabbix-proxy-sqlite3:alpine-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-trunk + image: zabbix/zabbix-proxy-mysql:alpine-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:alpine-trunk + image: zabbix/zabbix-web-apache-mysql:alpine-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:alpine-trunk + image: zabbix/zabbix-web-nginx-mysql:alpine-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-trunk + image: zabbix/zabbix-agent:alpine-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-trunk + image: zabbix/zabbix-java-gateway:alpine-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml index 9051c1cb7..39ede361f 100644 --- a/docker-compose_v2_alpine_pgsql_latest.yaml +++ b/docker-compose_v2_alpine_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-trunk + image: zabbix/zabbix-server-pgsql:alpine-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + image: zabbix/zabbix-proxy-sqlite3:alpine-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "alpine" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:alpine-trunk + image: zabbix/zabbix-proxy-mysql:alpine-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "alpine" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:alpine-trunk + image: zabbix/zabbix-web-apache-pgsql:alpine-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "alpine" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk + image: zabbix/zabbix-web-nginx-pgsql:alpine-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "alpine" zabbix-agent: - image: zabbix/zabbix-agent:alpine-trunk + image: zabbix/zabbix-agent:alpine-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "alpine" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:alpine-trunk + image: zabbix/zabbix-java-gateway:alpine-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "alpine" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index 535ceaa95..70e2b34bc 100644 --- a/docker-compose_v2_ubuntu_mysql_latest.yaml +++ b/docker-compose_v2_ubuntu_mysql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-mysql:ubuntu-trunk + image: zabbix/zabbix-server-mysql:ubuntu-latest ports: - "10051:10051" volumes: @@ -44,7 +44,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest ports: - "10061:10051" volumes: @@ -84,7 +84,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + image: zabbix/zabbix-proxy-mysql:ubuntu-latest ports: - "10071:10051" volumes: @@ -125,7 +125,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-mysql: - image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk + image: zabbix/zabbix-web-apache-mysql:ubuntu-latest ports: - "80:80" - "443:443" @@ -156,7 +156,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-mysql: - image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk + image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest ports: - "8081:80" - "8443:443" @@ -187,7 +187,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-trunk + image: zabbix/zabbix-agent:ubuntu-latest ports: - "10050:10050" volumes: @@ -217,7 +217,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-trunk + image: zabbix/zabbix-java-gateway:ubuntu-latest ports: - "10052:10052" env_file: @@ -235,7 +235,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index df40f14c2..713a2e4f1 100644 --- a/docker-compose_v2_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v2_ubuntu_pgsql_latest.yaml @@ -1,7 +1,7 @@ version: '2' services: zabbix-server: - image: zabbix/zabbix-server-pgsql:ubuntu-trunk + image: zabbix/zabbix-server-pgsql:ubuntu-latest ports: - "10051:10051" volumes: @@ -43,7 +43,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-sqlite3: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk + image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest ports: - "10061:10051" volumes: @@ -83,7 +83,7 @@ services: com.zabbix.os: "ubuntu" zabbix-proxy-mysql: - image: zabbix/zabbix-proxy-mysql:ubuntu-trunk + image: zabbix/zabbix-proxy-mysql:ubuntu-latest ports: - "10071:10051" volumes: @@ -124,7 +124,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-apache-pgsql: - image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk + image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest ports: - "80:80" - "443:443" @@ -155,7 +155,7 @@ services: com.zabbix.os: "ubuntu" zabbix-web-nginx-pgsql: - image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk + image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest ports: - "8081:80" - "8443:443" @@ -186,7 +186,7 @@ services: com.zabbix.os: "ubuntu" zabbix-agent: - image: zabbix/zabbix-agent:ubuntu-trunk + image: zabbix/zabbix-agent:ubuntu-latest ports: - "10050:10050" volumes: @@ -216,7 +216,7 @@ services: com.zabbix.os: "ubuntu" zabbix-java-gateway: - image: zabbix/zabbix-java-gateway:ubuntu-trunk + image: zabbix/zabbix-java-gateway:ubuntu-latest ports: - "10052:10052" env_file: @@ -234,7 +234,7 @@ services: com.zabbix.os: "ubuntu" zabbix-snmptraps: - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:ubuntu-latest ports: - "162:162/udp" volumes: diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index ebe98f512..4a5f6328b 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -34,9 +34,9 @@ RUN addgroup zabbix && \ supervisor && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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" \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index f7a170c19..673417e90 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -39,9 +39,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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" \ diff --git a/kubernetes.yaml b/kubernetes.yaml index b37a655a3..40e162483 100644 --- a/kubernetes.yaml +++ b/kubernetes.yaml @@ -148,7 +148,7 @@ spec: spec: containers: - name: zabbix-web - image: zabbix/zabbix-web-nginx-mysql:alpine-trunk + image: zabbix/zabbix-web-nginx-mysql:alpine-latest imagePullPolicy: Always ports: - containerPort: 80 @@ -282,7 +282,7 @@ spec: spec: containers: - name: zabbix-server - image: zabbix/zabbix-server-mysql:alpine-trunk + image: zabbix/zabbix-server-mysql:alpine-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -331,7 +331,7 @@ spec: mountPath: /var/lib/zabbix/snmptraps/ readOnly: true - name: zabbix-snmptraps - image: zabbix/zabbix-snmptraps:ubuntu-trunk + image: zabbix/zabbix-snmptraps:latest imagePullPolicy: Always ports: - containerPort: 162 @@ -364,7 +364,7 @@ spec: spec: containers: - name: zabbix-proxy-sqlite3 - image: zabbix/zabbix-proxy-sqlite3:alpine-trunk + image: zabbix/zabbix-proxy-sqlite3:alpine-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -396,7 +396,7 @@ spec: spec: containers: - name: zabbix-proxy-mysql - image: zabbix/zabbix-proxy-mysql:alpine-trunk + image: zabbix/zabbix-proxy-mysql:alpine-latest imagePullPolicy: Always ports: - containerPort: 10051 @@ -439,7 +439,7 @@ spec: spec: containers: - name: zabbix-java-gateway - image: zabbix/zabbix-java-gateway:alpine-trunk + image: zabbix/zabbix-java-gateway:alpine-latest imagePullPolicy: Always ports: - containerPort: 10052 @@ -470,7 +470,7 @@ spec: spec: containers: - name: zabbix-agent - image: zabbix/zabbix-agent:alpine-trunk + image: zabbix/zabbix-agent:alpine-latest imagePullPolicy: Always resources: limits: diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 001a2e6d0..1942a7fd4 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -45,7 +45,6 @@ RUN addgroup zabbix && \ bash \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ @@ -53,15 +52,14 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ supervisor \ unixodbc \ fping && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -74,14 +72,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ subversion \ unixodbc-dev \ alpine-sdk && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 134f3d220..52c155846 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -50,10 +50,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 libmysqlclient18 \ libopenipmi0 \ - libpcre3 \ libsnmp30 \ libssh2-1 \ libssl1.0.0 \ @@ -66,9 +64,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -83,11 +81,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ @@ -138,11 +134,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 265e115a6..4a15f1126 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -45,21 +45,19 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ sqlite-libs \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -73,13 +71,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ sqlite-dev \ subversion \ unixodbc-dev && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index c8b5408b2..58f8311a7 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -49,9 +49,7 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 \ libopenipmi0 \ - libpcre3 \ libsnmp30 \ libsqlite3-0 \ libssh2-1 \ @@ -64,9 +62,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -81,10 +79,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libsqlite3-dev \ libssh2-1-dev \ @@ -133,10 +129,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libsqlite3-dev \ libssh2-1-dev \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index c434172cb..df0ae88c1 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -48,7 +48,6 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ @@ -56,14 +55,13 @@ RUN addgroup zabbix && \ mariadb-client-libs \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -77,14 +75,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ subversion \ unixodbc-dev && \ cd /tmp/ && \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 574d307a0..72d483ec5 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -52,11 +52,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 - libevent-2.0 \ libiksemel3 \ libmysqlclient18 \ libopenipmi0 \ - libpcre3 \ libsnmp30 \ libssh2-1 \ libssl1.0.0 \ @@ -69,9 +67,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -86,12 +84,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ @@ -145,12 +141,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ libsnmp-dev \ libssh2-1-dev \ libxml2-dev \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 50a185cab..60310b3b5 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -48,22 +48,20 @@ RUN addgroup zabbix && \ fping \ iputils \ libcurl \ - libevent \ libldap \ libssh2 \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ postgresql-client \ postgresql-libs \ supervisor \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -77,13 +75,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ curl-dev \ - libevent-dev \ libssh2-dev \ libxml2-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ - pcre-dev \ postgresql-dev \ subversion \ unixodbc-dev && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 2585eddd3..cb53966ae 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -52,10 +52,8 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTANT} install \ fping \ libcurl3 \ - libevent-2.0 \ libiksemel3 \ libopenipmi0 \ - libpcre3 \ libpq5 \ libsnmp30 \ libssh2-1 \ @@ -69,9 +67,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -86,11 +84,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libpq-dev \ libsnmp-dev \ libssh2-1-dev \ @@ -145,11 +141,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gcc \ libc6-dev \ libcurl4-openssl-dev \ - libevent-dev \ libiksemel-dev \ libldap2-dev \ libopenipmi-dev \ - libpcre3-dev \ libpq-dev \ libsnmp-dev \ libssh2-1-dev \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 4e3a2ed10..b9cda45bb 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -51,9 +51,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 6bdcd1880..624d255de 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -48,9 +48,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index e0f7bfc14..7f1cc5a5c 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -50,9 +50,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index c3cdbd1bf..2cadc2a5f 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -48,9 +48,9 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 4625d7ae5..4cde87fa0 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -50,9 +50,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 49ad357f1..1c2ff133b 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -58,9 +58,9 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 9e4748ef0..b23f4e4c0 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -49,9 +49,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 7c782307b..f6c15d2b3 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -59,9 +59,9 @@ RUN locale-gen $LC_ALL && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=master ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \