Skip to content
Snippets Groups Projects
Commit 5edd34fe authored by Francesco Giacomini's avatar Francesco Giacomini
Browse files

Merge branch '36-new-stable-nginx-release-1-26-3' into 'master'

Resolve "New stable NGINX release 1.26.3"

Closes #36

See merge request !28
parents 3c4a7183 c9ea10b6
Branches master
No related tags found
1 merge request!28Resolve "New stable NGINX release 1.26.3"
Pipeline #268557 canceled
...@@ -13,7 +13,7 @@ downloadNginx() { ...@@ -13,7 +13,7 @@ downloadNginx() {
# set nginx version # set nginx version
if [ -z ${ngxVersion} ]; then if [ -z ${ngxVersion} ]; then
ngxVersion=1.26.2-1 ngxVersion=1.26.3-1
fi fi
elVersion=$(rpmbuild --eval %{rhel}) elVersion=$(rpmbuild --eval %{rhel})
echo "Downloading nginx version ${ngxVersion} (EL${elVersion})" echo "Downloading nginx version ${ngxVersion} (EL${elVersion})"
......
...@@ -27,7 +27,7 @@ COPY artifacts/*.rpm /pkgs/ ...@@ -27,7 +27,7 @@ COPY artifacts/*.rpm /pkgs/
COPY nginx.repo /etc/yum.repos.d/nginx.repo COPY nginx.repo /etc/yum.repos.d/nginx.repo
RUN rpm -ivh /pkgs/nginx-*.el${EL_VERSION}.httpg.x86_64.rpm && \ 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 && \ 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 # forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log && ln -sf /dev/stderr /var/log/nginx/error.log
......
%define nginx_user nginx %define nginx_user nginx
%define nginx_group nginx %define nginx_group nginx
%define base_version 1.26.2 %define base_version 1.26.3
%define bdir %{_builddir}/%{name}-%{base_version} %define bdir %{_builddir}/%{name}-%{base_version}
Name: nginx-module-http-voms Name: nginx-module-http-voms
...@@ -84,6 +84,9 @@ fi ...@@ -84,6 +84,9 @@ fi
%changelog %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 * Fri Oct 18 2024 Francesco Giacomini
- nginx http voms module updated to 1.26.2-1.0.0 - nginx http voms module updated to 1.26.2-1.0.0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment