Updated Go lang on Ubuntu (noble), Nginx on RHEL like OS base images

zabbix · Dec 7, 2024 · 5be602e · 5be602e
1 parent 1ae260e
commit 5be602e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile
@@ -6,7 +6,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.20
 
 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 <[email protected]>" \
       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
@@ -136,23 +136,20 @@ 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 && \
     cp /tmp/mongodb-plugin-${MONGODB_PLUGIN_VERSION}/mongodb.conf ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
     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 && \
     cp /tmp/postgresql-plugin-${POSTGRESQL_PLUGIN_VERSION}/postgresql.conf ${ZBX_OUTPUT_DIR}/agent2/conf/zabbix_agent2.d/plugins.d/ && \
     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 && \

diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile
@@ -52,7 +52,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
@@ -52,7 +52,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
@@ -76,7 +76,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
@@ -60,7 +60,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
@@ -53,7 +53,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
@@ -77,7 +77,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" \