From 5dd85d40cded269acdbf9106ce4ee434bdc4799c Mon Sep 17 00:00:00 2001
From: Luca Bassi <luca@argoware.com>
Date: Thu, 6 Mar 2025 18:25:02 +0100
Subject: [PATCH 1/2] Install nginx-module-njs without upgrading nginx
---
docker/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bea62b6..7f58072 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,7 +27,7 @@ COPY artifacts/*.rpm /pkgs/
COPY nginx.repo /etc/yum.repos.d/nginx.repo
RUN rpm -ivh /pkgs/nginx-*.el${EL_VERSION}.httpg.x86_64.rpm && \
rpm -ivh /pkgs/nginx-module-http-voms-*.el${EL_VERSION}.x86_64.rpm && \
- dnf install -y nginx-module-njs \
+ dnf install -y nginx-module-njs-$(rpm -q --qf %{VERSION} nginx)* \
# forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log
--
GitLab
From c9ea10b60964b9bef47be30ec5a4112884760082 Mon Sep 17 00:00:00 2001
From: Luca Bassi <luca@argoware.com>
Date: Thu, 6 Mar 2025 19:22:40 +0100
Subject: [PATCH 2/2] Update to nginx 1.26.3
---
.devcontainer/assets/build-library.sh | 2 +-
rpm/nginx-module-http-voms.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.devcontainer/assets/build-library.sh b/.devcontainer/assets/build-library.sh
index 21f19e4..1cb19a8 100644
--- a/.devcontainer/assets/build-library.sh
+++ b/.devcontainer/assets/build-library.sh
@@ -13,7 +13,7 @@ downloadNginx() {
# set nginx version
if [ -z ${ngxVersion} ]; then
- ngxVersion=1.26.2-1
+ ngxVersion=1.26.3-1
fi
elVersion=$(rpmbuild --eval %{rhel})
echo "Downloading nginx version ${ngxVersion} (EL${elVersion})"
diff --git a/rpm/nginx-module-http-voms.spec b/rpm/nginx-module-http-voms.spec
index 8d45c81..719e4c9 100644
--- a/rpm/nginx-module-http-voms.spec
+++ b/rpm/nginx-module-http-voms.spec
@@ -1,6 +1,6 @@
%define nginx_user nginx
%define nginx_group nginx
-%define base_version 1.26.2
+%define base_version 1.26.3
%define bdir %{_builddir}/%{name}-%{base_version}
Name: nginx-module-http-voms
@@ -84,6 +84,9 @@ fi
%changelog
+* Thu Mar 6 2025 Francesco Giacomini
+- nginx http voms module updated to 1.26.3-1.0.0
+
* Fri Oct 18 2024 Francesco Giacomini
- nginx http voms module updated to 1.26.2-1.0.0
--
GitLab