diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 755cca6a2..b59287c8f 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -eux && \ iputils \ pcre \ libcurl \ + libmodbus \ libldap && \ rm -rf /var/cache/apk/* @@ -53,6 +54,7 @@ RUN set -eux && \ curl-dev \ openssl-dev \ openldap-dev \ + libmodbus-dev \ g++ \ pcre-dev \ make \ @@ -72,6 +74,7 @@ RUN set -eux && \ --prefix=/usr \ --enable-agent \ --with-libcurl \ + --with-libmodbus \ --with-ldap \ --with-openssl \ --enable-ipv6 \ diff --git a/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo new file mode 100644 index 000000000..6c99308a6 --- /dev/null +++ b/agent/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo @@ -0,0 +1,6 @@ +[ol8_developer_EPEL] +name=Oracle Linux $releasever EPEL Packages for Development ($basearch) +baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/ +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle +gpgcheck=1 +enabled=0 diff --git a/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo b/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo new file mode 100644 index 000000000..6c99308a6 --- /dev/null +++ b/agent2/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo @@ -0,0 +1,6 @@ +[ol8_developer_EPEL] +name=Oracle Linux $releasever EPEL Packages for Development ($basearch) +baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/ +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle +gpgcheck=1 +enabled=0 diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 71eda1d23..5590a02d1 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -4,7 +4,7 @@ services: build: context: ./server-mysql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-server-mysql:alpine-local ports: - "10051:10051" @@ -71,7 +71,7 @@ services: build: context: ./proxy-sqlite3/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-proxy-sqlite3:alpine-local profiles: - all @@ -124,7 +124,7 @@ services: build: context: ./proxy-mysql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-proxy-mysql:alpine-local profiles: - all @@ -186,7 +186,7 @@ services: build: context: ./web-apache-mysql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-web-apache-mysql:alpine-local profiles: - all @@ -246,7 +246,7 @@ services: build: context: ./web-nginx-mysql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-web-nginx-mysql:alpine-local ports: - "80:8080" @@ -304,7 +304,7 @@ services: build: context: ./agent/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-agent:alpine-local profiles: - full @@ -348,7 +348,7 @@ services: build: context: ./java-gateway/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-java-gateway:alpine-local profiles: - full @@ -381,7 +381,7 @@ services: build: context: ./snmptraps/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-snmptraps:alpine-local profiles: - full @@ -414,7 +414,7 @@ services: build: context: ./web-service/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-web-service:alpine-local profiles: - full diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 94afb51e6..792aab882 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -4,7 +4,7 @@ services: build: context: ./server-pgsql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-server-pgsql:alpine-local ports: - "10051:10051" @@ -70,7 +70,7 @@ services: build: context: ./proxy-sqlite3/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-proxy-sqlite3:alpine-local profiles: - all @@ -123,7 +123,7 @@ services: build: context: ./proxy-mysql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-proxy-mysql:alpine-local profiles: - all @@ -182,7 +182,7 @@ services: build: context: ./web-apache-pgsql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-web-apache-pgsql:alpine-local profiles: - all @@ -242,7 +242,7 @@ services: build: context: ./web-nginx-pgsql/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-web-nginx-pgsql:alpine-local ports: - "80:8080" @@ -300,7 +300,7 @@ services: build: context: ./agent/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-agent:alpine-local profiles: - full @@ -344,7 +344,7 @@ services: build: context: ./java-gateway/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-java-gateway:alpine-local profiles: - full @@ -377,7 +377,7 @@ services: build: context: ./snmptraps/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-snmptraps:alpine-local profiles: - full @@ -410,7 +410,7 @@ services: build: context: ./web-service/alpine cache_from: - - alpine:3.13 + - alpine:3.14 image: zabbix-web-service:alpine-local profiles: - full