diff --git a/src/linux/Dockerfile-debian b/src/linux/Dockerfile-debian index a7fa1a709..98a106898 100644 --- a/src/linux/Dockerfile-debian +++ b/src/linux/Dockerfile-debian @@ -1,7 +1,7 @@ FROM debian:bookworm-slim@sha256:d02c76d82364cedca16ba3ed6f9102406fa9fa8833076a609cabf14270f43dfc AS builder ENV OS=debian -ENV NGINX_VERSION=1.26.1 +ENV NGINX_VERSION=1.26.2 # Install Nginx and dependencies RUN apt update && \ @@ -11,7 +11,7 @@ RUN apt update && \ echo "deb-src https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \ apt-get update && \ - apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-2~bookworm + apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~bookworm WORKDIR /tmp/bunkerweb/deps diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora index 7d18c5cd8..fd60f8030 100644 --- a/src/linux/Dockerfile-fedora +++ b/src/linux/Dockerfile-fedora @@ -1,7 +1,7 @@ FROM fedora:40@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0 AS builder ENV OS=fedora -ENV NGINX_VERSION=1.26.1 +ENV NGINX_VERSION=1.26.2 # Install Nginx, fpm and dependencies RUN dnf update -y && \ diff --git a/src/linux/Dockerfile-rhel b/src/linux/Dockerfile-rhel index 7d34ec9fa..ea65e22e1 100644 --- a/src/linux/Dockerfile-rhel +++ b/src/linux/Dockerfile-rhel @@ -1,7 +1,7 @@ FROM redhat/ubi8:8.10@sha256:d5e2d1ddf34b573673581940f1341c7b3301ff8efde28f17100b31a3df7d94b6 AS builder ENV OS=rhel -ENV NGINX_VERSION=1.26.1 +ENV NGINX_VERSION=1.26.2 # Copy rocky repo COPY src/linux/rocky-8.repo /etc/yum.repos.d/rocky.repo @@ -17,7 +17,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-8 RUN dnf install -y wget make yum-utils && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ dnf install -y --setopt=install_weak_deps=False readline-devel python39 python39-devel python39-setuptools brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ curl znc-modtcl gawk libtool pcre-devel automake autoconf gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel && \ - dnf install -y https://nginx.org/packages/rhel/8/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-2.el8.ngx.$(uname -m).rpm + dnf install -y https://nginx.org/packages/rhel/8/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-1.el8.ngx.$(uname -m).rpm WORKDIR /tmp/bunkerweb/deps diff --git a/src/linux/Dockerfile-rhel9 b/src/linux/Dockerfile-rhel9 index 6c36a1c54..84303937e 100644 --- a/src/linux/Dockerfile-rhel9 +++ b/src/linux/Dockerfile-rhel9 @@ -1,7 +1,7 @@ FROM redhat/ubi9:9.4@sha256:1ee4d8c50d14d9c9e9229d9a039d793fcbc9aa803806d194c957a397cf1d2b17 AS builder ENV OS=rhel -ENV NGINX_VERSION=1.26.1 +ENV NGINX_VERSION=1.26.2 # Copy rocky repo COPY src/linux/rocky-9.repo /etc/yum.repos.d/rocky.repo @@ -18,9 +18,7 @@ RUN dnf install -y wget make yum-utils && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ dnf install -y --skip-broken --setopt=install_weak_deps=False --nobest openssl-libs openssl-devel && \ dnf install -y --skip-broken --setopt=install_weak_deps=False readline-devel python39 brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl libxslt bash gd gd-devel gcc-c++ znc-modtcl gawk libtool pcre-devel automake autoconf gcc make git zlib-devel libxml2-devel pkgconf libcurl-devel libmaxminddb && \ - wget https://nginx.org/packages/rhel/9/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-2.el9.ngx.$(uname -m).rpm && \ - dnf install nginx-${NGINX_VERSION}-2.el9.ngx.$(uname -m).rpm -y && \ - rm -rf nginx-${NGINX_VERSION}-2.el9.ngx.$(uname -m).rpm + dnf install -y https://nginx.org/packages/rhel/9/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-1.el9.ngx.$(uname -m).rpm WORKDIR /tmp/bunkerweb/deps diff --git a/src/linux/Dockerfile-ubuntu b/src/linux/Dockerfile-ubuntu index 392411645..f2ecc5793 100644 --- a/src/linux/Dockerfile-ubuntu +++ b/src/linux/Dockerfile-ubuntu @@ -1,7 +1,7 @@ FROM ubuntu:24.04@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8 AS builder ENV OS=ubuntu -ENV NGINX_VERSION=1.26.1 +ENV NGINX_VERSION=1.26.2 # Install Nginx and dependencies RUN apt update && \ @@ -11,7 +11,7 @@ RUN apt update && \ echo "deb-src https://nginx.org/packages/ubuntu/ noble nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \ apt-get update && \ - apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-2~noble + apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~noble WORKDIR /tmp/bunkerweb/deps diff --git a/src/linux/Dockerfile-ubuntu-jammy b/src/linux/Dockerfile-ubuntu-jammy index a5371af2d..5f812182b 100644 --- a/src/linux/Dockerfile-ubuntu-jammy +++ b/src/linux/Dockerfile-ubuntu-jammy @@ -1,7 +1,7 @@ FROM ubuntu:22.04@sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 AS builder ENV OS=ubuntu -ENV NGINX_VERSION=1.26.1 +ENV NGINX_VERSION=1.26.2 # Install Nginx and dependencies RUN apt update && \ @@ -11,7 +11,7 @@ RUN apt update && \ echo "deb-src https://nginx.org/packages/ubuntu/ jammy nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \ apt-get update && \ - apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-2~jammy + apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~jammy WORKDIR /tmp/bunkerweb/deps diff --git a/src/linux/fpm-debian b/src/linux/fpm-debian index ee4de2d64..6b8493519 100644 --- a/src/linux/fpm-debian +++ b/src/linux/fpm-debian @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python3 --depends procps --depends python3-pip --depends 'nginx = 1.26.1-2~bookworm' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends lsof --depends libpq5 --depends libpcre3 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip +--depends bash --depends python3 --depends procps --depends python3-pip --depends 'nginx = 1.26.2-1~bookworm' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends lsof --depends libpq5 --depends libpcre3 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --description "BunkerWeb %VERSION% for Debian 12" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-fedora b/src/linux/fpm-fedora index ee2c38e9c..0e055f77d 100644 --- a/src/linux/fpm-fedora +++ b/src/linux/fpm-fedora @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python3 --depends 'nginx >= 1:1.26.1' --depends 'nginx < 1:1.27.0' --depends 'nginx-mod-stream >= 1:1.26.1' --depends 'nginx-mod-stream < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip +--depends bash --depends python3 --depends 'nginx >= 1:1.26.2' --depends 'nginx < 1:1.27.0' --depends 'nginx-mod-stream >= 1:1.26.2' --depends 'nginx-mod-stream < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip --description "BunkerWeb %VERSION% for Fedora 40" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-rhel b/src/linux/fpm-rhel index 146c42bf2..549337f94 100644 --- a/src/linux/fpm-rhel +++ b/src/linux/fpm-rhel @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python39 --depends 'nginx >= 1:1.26.1' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends geoip --depends libpq --depends libcap --depends openssl --depends sqlite --depends unzip +--depends bash --depends python39 --depends 'nginx >= 1:1.26.2' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends geoip --depends libpq --depends libcap --depends openssl --depends sqlite --depends unzip --description "BunkerWeb %VERSION% for RHEL 8" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-rhel9 b/src/linux/fpm-rhel9 index 34bda5a92..b0a057c22 100644 --- a/src/linux/fpm-rhel9 +++ b/src/linux/fpm-rhel9 @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python39 --depends 'nginx >= 1:1.26.1' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends libmaxminddb --depends libpq --depends libcap --depends openssl --depends mysql --depends postgresql --depends sqlite --depends unzip +--depends bash --depends python39 --depends 'nginx >= 1:1.26.2' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends libmaxminddb --depends libpq --depends libcap --depends openssl --depends mysql --depends postgresql --depends sqlite --depends unzip --description "BunkerWeb %VERSION% for RHEL 9" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-ubuntu b/src/linux/fpm-ubuntu index 63d5e013a..85b7cc3b6 100644 --- a/src/linux/fpm-ubuntu +++ b/src/linux/fpm-ubuntu @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.1-2~noble' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 +--depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.2-1~noble' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 --description "BunkerWeb %VERSION% for Ubuntu 24.04" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-ubuntu-jammy b/src/linux/fpm-ubuntu-jammy index 6d9eebc05..2b0f52092 100644 --- a/src/linux/fpm-ubuntu-jammy +++ b/src/linux/fpm-ubuntu-jammy @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.1-2~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 +--depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.2-1~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 --description "BunkerWeb %VERSION% for Ubuntu 22.04" --url "https://www.bunkerweb.io" --maintainer "Bunkerity "