diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index dae0ef1a4..0b4c9115b 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.18 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 932e6e77e..801ac9e6d 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.18 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 6613bcd8a..231d3879b 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.18 +FROM alpine:3.19 ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index e926e7abb..2f36885be 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -23,6 +23,7 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] +COPY ["conf/agent2_build.patch", "/tmp/agent2_build.patch"] RUN set -eux && \ ARCH_SUFFIX="$(arch)"; \ @@ -48,6 +49,7 @@ RUN set -eux && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ + patch -p1 < /tmp/agent2_build.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ diff --git a/Dockerfiles/build-mysql/alpine/conf/agent2_build.patch b/Dockerfiles/build-mysql/alpine/conf/agent2_build.patch new file mode 100644 index 000000000..9c814f332 --- /dev/null +++ b/Dockerfiles/build-mysql/alpine/conf/agent2_build.patch @@ -0,0 +1,13 @@ +diff --git a/src/go/Makefile.am b/src/go/Makefile.am +index 2dd9e84e4ea..74bc3fbb91e 100644 +--- a/src/go/Makefile.am ++++ b/src/go/Makefile.am +@@ -49,7 +49,7 @@ endif + all: build + + zabbix.com/cmd/zabbix_agent2: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 ++ CGO_CFLAGS="${CGO_CFLAGS} -D_LARGEFILE64_SOURCE" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 + + zabbix.com/cmd/zabbix_web_service: + go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 26e77c8d4..f662b1262 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -23,6 +23,7 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] +COPY ["conf/agent2_build.patch", "/tmp/agent2_build.patch"] RUN set -eux && \ ARCH_SUFFIX="$(arch)"; \ @@ -48,6 +49,7 @@ RUN set -eux && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ patch -p1 < /tmp/chromedp_no_sandbox.patch && \ + patch -p1 < /tmp/agent2_build.patch && \ zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ diff --git a/Dockerfiles/build-pgsql/alpine/conf/agent2_build.patch b/Dockerfiles/build-pgsql/alpine/conf/agent2_build.patch new file mode 100644 index 000000000..9c814f332 --- /dev/null +++ b/Dockerfiles/build-pgsql/alpine/conf/agent2_build.patch @@ -0,0 +1,13 @@ +diff --git a/src/go/Makefile.am b/src/go/Makefile.am +index 2dd9e84e4ea..74bc3fbb91e 100644 +--- a/src/go/Makefile.am ++++ b/src/go/Makefile.am +@@ -49,7 +49,7 @@ endif + all: build + + zabbix.com/cmd/zabbix_agent2: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 ++ CGO_CFLAGS="${CGO_CFLAGS} -D_LARGEFILE64_SOURCE" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 + + zabbix.com/cmd/zabbix_web_service: + go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 973d9e455..8132f578a 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -22,6 +22,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov