From 991a9b38df1a48cfbe913b9ef7fe74d8b3acfab0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 7 Dec 2024 16:48:07 +0900 Subject: [PATCH] Updated Go lang on Ubuntu (noble), Nginx on RHEL like OS base images --- Dockerfiles/build-base/ubuntu/Dockerfile | 4 ++-- Dockerfiles/build-mysql/centos/Dockerfile | 4 ---- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 3 ++- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 3 ++- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 3 ++- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 3 ++- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 3 ++- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 3 ++- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 4e306fb50..6ff6800c5 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -6,7 +6,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION} ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ - PATH=/usr/lib/go-1.22/bin:$PATH + PATH=/usr/lib/go-1.23/bin:$PATH LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ @@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ pkg-config \ gettext \ git \ - golang-1.22 \ + golang-1.23 \ unzip \ unixodbc-dev \ zlib1g-dev" && \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index a7ac698f4..6b16b5597 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -137,7 +137,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ mkdir -p ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \ git -c advice.detachedHead=false clone ${MONGODB_PLUGIN_SOURCES} --branch ${MONGODB_PLUGIN_VERSION} --depth 1 --single-branch /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION} && \ cd /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION} && \ - sed -i 's/go 1.2[0-9]/go 1.21/g' go.mod && \ make && \ strip /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION}/zabbix-agent2-plugin-mongodb && \ cp /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION}/zabbix-agent2-plugin-mongodb ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/mongodb && \ @@ -145,7 +144,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cd /tmp/ && \ git -c advice.detachedHead=false clone ${POSTGRESQL_PLUGIN_SOURCES} --branch ${POSTGRESQL_PLUGIN_VERSION} --depth 1 --single-branch /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION} && \ cd /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION} && \ - sed -i 's/go 1.2[0-9]/go 1.21/g' go.mod && \ make && \ strip /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION}/zabbix-agent2-plugin-postgresql && \ cp /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION}/zabbix-agent2-plugin-postgresql ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/postgresql && \ @@ -153,7 +151,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cd /tmp/ && \ git -c advice.detachedHead=false clone ${MSSQL_PLUGIN_SOURCES} --branch ${MSSQL_PLUGIN_VERSION} --depth 1 --single-branch /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION} && \ cd /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION} && \ - sed -i 's/go 1.2[0-9]/go 1.21/g' go.mod && \ make && \ strip /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION}/zabbix-agent2-plugin-mssql && \ cp /tmp/mssql-plugin-${MSSQL_PLUGIN_VERSION}/zabbix-agent2-plugin-mssql ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/mssql && \ @@ -161,7 +158,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ cd /tmp/ && \ git -c advice.detachedHead=false clone ${EMBER_PLUS_PLUGIN_SOURCES} --branch ${EMBER_PLUS_PLUGIN_VERSION} --depth 1 --single-branch /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION} && \ cd /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION} && \ - sed -i 's/go 1.2[0-9]/go 1.21/g' go.mod && \ make && \ strip /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION}/zabbix-agent2-plugin-ember-plus && \ cp /tmp/ember-plugin-${EMBER_PLUS_PLUGIN_VERSION}/zabbix-agent2-plugin-ember-plus ${ZBX_OUTPUT_DIR}/agent2/sbin/zabbix-agent2-plugin/ember-plus && \ diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index dd5b17db1..f5c0b7274 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -53,7 +53,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 && \ + php:8.2 \ + nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "extras-common" \ diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index c2ff75e5a..fe8b8547a 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -53,7 +53,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "ol9_appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 && \ + php:8.2 \ + nginx:1.24 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 2edb024a1..bfe794850 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -77,7 +77,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 && \ + php:8.2 \ + nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \ diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index cc9d14412..37ab8cf72 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -61,7 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ php:8.2 \ - postgresql:16 && \ + postgresql:16 \ + nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index c5e142312..e17fc6ec0 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -54,7 +54,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ php:8.2 \ - postgresql:16 && \ + postgresql:16 \ + nginx:1.24 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index f00f5189b..71afc3008 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -78,7 +78,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ php:8.2 \ - postgresql:16 && \ + postgresql:16 \ + nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \