mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 09:28:37 +00:00
Update workflows and Dockerfiles to support Fedora 40, removing references to Fedora 41
This commit is contained in:
Théophile Diot
parent
3e67dbdb8d
commit
e346f31807
12 changed files with 20 additions and 21 deletions
2
.github/workflows/1.5.yml
vendored
2
.github/workflows/1.5.yml
vendored
|
|
@ -208,7 +208,7 @@ jobs:
|
|||
package_arch: x86_64
|
||||
separator: "-"
|
||||
suffix: "1."
|
||||
version: 41
|
||||
version: 40
|
||||
package: rpm
|
||||
- linux: el
|
||||
package_arch: x86_64
|
||||
|
|
|
|||
2
.github/workflows/beta.yml
vendored
2
.github/workflows/beta.yml
vendored
|
|
@ -199,7 +199,7 @@ jobs:
|
|||
- linux: fedora
|
||||
separator: "-"
|
||||
suffix: "1."
|
||||
version: 41
|
||||
version: 40
|
||||
package: rpm
|
||||
- linux: el
|
||||
separator: "-"
|
||||
|
|
|
|||
2
.github/workflows/dev.yml
vendored
2
.github/workflows/dev.yml
vendored
|
|
@ -210,7 +210,7 @@ jobs:
|
|||
package_arch: x86_64
|
||||
separator: "-"
|
||||
suffix: "1."
|
||||
version: 41
|
||||
version: 40
|
||||
package: rpm
|
||||
- linux: el
|
||||
package_arch: x86_64
|
||||
|
|
|
|||
2
.github/workflows/rc.yml
vendored
2
.github/workflows/rc.yml
vendored
|
|
@ -199,7 +199,7 @@ jobs:
|
|||
- linux: fedora
|
||||
separator: "-"
|
||||
suffix: "1."
|
||||
version: 41
|
||||
version: 40
|
||||
package: rpm
|
||||
- linux: el
|
||||
separator: "-"
|
||||
|
|
|
|||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -211,7 +211,7 @@ jobs:
|
|||
- linux: fedora
|
||||
separator: "-"
|
||||
suffix: "1."
|
||||
version: 41
|
||||
version: 40
|
||||
package: rpm
|
||||
- linux: el
|
||||
separator: "-"
|
||||
|
|
|
|||
2
.github/workflows/staging.yml
vendored
2
.github/workflows/staging.yml
vendored
|
|
@ -178,7 +178,7 @@ jobs:
|
|||
package_arch: x86_64
|
||||
separator: "-"
|
||||
suffix: "1."
|
||||
version: 41
|
||||
version: 40
|
||||
package: rpm
|
||||
- linux: el
|
||||
package_arch: x86_64
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
- [BUGFIX] Increase string length for service_id and id columns in database models to avoid issues with long service names
|
||||
- [BUGFIX] Fix shenanigans with setup wizard when a reverse proxy was already configured
|
||||
- [LINUX] Support Fedora 40 back and temporarily put aside Fedora 41 (there are issues when building the images)
|
||||
- [UI] Add `CHECK_PRIVATE_IP` configuration to manage session IP address changes for private networks
|
||||
- [UI] Implement `ALWAYS_REMEMBER` functionality for session persistence in login
|
||||
- [UI] Add temporary UI service to show errors that occurred if any while web UI was starting up
|
||||
|
|
|
|||
|
|
@ -298,7 +298,8 @@ List of supported Linux distros :
|
|||
- Debian 12 "Bookworm"
|
||||
- Ubuntu 22.04 "Noble"
|
||||
- Ubuntu 24.04 "Jammy"
|
||||
- Fedora 41
|
||||
- Fedora 40
|
||||
- Fedora 41 (to be released)
|
||||
- RHEL 8.9
|
||||
- RHEL 9.4
|
||||
|
||||
|
|
@ -375,7 +376,7 @@ Here is the list of "official" plugins that we maintain (see the [bunkerweb-plug
|
|||
| **Discord** | 1.6 | Send security notifications to a Discord channel using a Webhook. | [bunkerweb-plugins/discord](https://github.com/bunkerity/bunkerweb-plugins/tree/main/discord) |
|
||||
| **Slack** | 1.6 | Send security notifications to a Slack channel using a Webhook. | [bunkerweb-plugins/slack](https://github.com/bunkerity/bunkerweb-plugins/tree/main/slack) |
|
||||
| **VirusTotal** | 1.6 | Automatically scans uploaded files with the VirusTotal API and denies the request when a file is detected as malicious. | [bunkerweb-plugins/virustotal](https://github.com/bunkerity/bunkerweb-plugins/tree/main/virustotal) |
|
||||
| **WebHook** | 1.6 | Send security notifications to a custom HTTP endpoint using a Webhook. | [bunkerweb-plugins/webhook](https://github.com/bunkerity/bunkerweb-plugins/tree/main/webhook) |
|
||||
| **WebHook** | 1.6 | Send security notifications to a custom HTTP endpoint using a Webhook. | [bunkerweb-plugins/webhook](https://github.com/bunkerity/bunkerweb-plugins/tree/main/webhook) |
|
||||
|
||||
You will find more information in the [plugins section](https://docs.bunkerweb.io/1.6.0-rc1/plugins/?utm_campaign=self&utm_source=github) of the documentation.
|
||||
|
||||
|
|
|
|||
|
|
@ -323,7 +323,8 @@ Supported Linux distributions for BunkerWeb (amd64/x86_64 and arm64/aarch64 arch
|
|||
- Debian 12 "Bookworm"
|
||||
- Ubuntu 22.04 "Jammy"
|
||||
- Ubuntu 24.04 "Noble"
|
||||
- Fedora 41
|
||||
- Fedora 40
|
||||
- Fedora 41 (to be released)
|
||||
- Red Hat Enterprise Linux (RHEL) 8.9
|
||||
- Red Hat Enterprise Linux (RHEL) 9.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e AS builder
|
||||
FROM fedora:40@sha256:7cdd2b48396929bb8723ea2fa60e03bee39cc22e2a853cbd891587fab4eb1bc9 AS builder
|
||||
|
||||
ENV OS=fedora
|
||||
ENV NGINX_VERSION=1.26.2
|
||||
|
|
@ -6,7 +6,7 @@ ENV NGINX_VERSION=1.26.2
|
|||
# Install Nginx, fpm and dependencies
|
||||
RUN dnf update -y && \
|
||||
dnf install -y curl gnupg2 ca-certificates redhat-lsb-core make gcc && \
|
||||
dnf install -y --setopt=install_weak_deps=False python3.12 python3.12-devel python3-pip brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ kernel-devel znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-devel && \
|
||||
dnf install -y --setopt=install_weak_deps=False python3 python3-devel python3-pip brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ kernel-devel znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-devel && \
|
||||
dnf install nginx-${NGINX_VERSION} -y
|
||||
|
||||
WORKDIR /tmp/bunkerweb/deps
|
||||
|
|
@ -32,9 +32,8 @@ WORKDIR /usr/share/bunkerweb
|
|||
# Compile and install dependencies
|
||||
RUN export MAKEFLAGS="-j$(nproc)" && \
|
||||
mkdir -p deps/python && \
|
||||
python3.12 -m ensurepip && \
|
||||
python3.12 -m pip install --no-cache-dir --require-hashes --ignore-installed -r /tmp/requirements-deps.txt && \
|
||||
python3.12 -m pip install --no-cache-dir --require-hashes --force-reinstall --target deps/python $(for file in $(ls /tmp/req/requirements*.txt) ; do echo "-r ${file}" ; done | xargs)
|
||||
pip install --no-cache-dir --require-hashes --ignore-installed -r /tmp/requirements-deps.txt && \
|
||||
pip install --no-cache-dir --require-hashes --force-reinstall --target deps/python $(for file in $(ls /tmp/req/requirements*.txt) ; do echo "-r ${file}" ; done | xargs)
|
||||
|
||||
# Copy files
|
||||
# can't exclude deps from . so we are copying everything by hand
|
||||
|
|
@ -54,7 +53,7 @@ COPY src/scheduler scheduler
|
|||
COPY src/VERSION VERSION
|
||||
COPY src/ui ui
|
||||
|
||||
FROM fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e
|
||||
FROM fedora:40@sha256:7cdd2b48396929bb8723ea2fa60e03bee39cc22e2a853cbd891587fab4eb1bc9
|
||||
|
||||
# Set default umask to prevent huge recursive chmod increasing the final image size
|
||||
RUN umask 027
|
||||
|
|
@ -100,9 +99,6 @@ COPY src/linux/fpm-fedora /usr/share/.fpm
|
|||
COPY --chmod=644 src/linux/*.service /lib/systemd/system/
|
||||
COPY --chmod=644 src/linux/bunkerweb.logrotate /etc/logrotate.d/bunkerweb
|
||||
|
||||
# TMP patch for fpm
|
||||
RUN sed -i -e 's/args = \["rpmbuild", "-bb"\]/args = \["rpmbuild", "-bb", "--buildroot", "#{build_path}\/BUILD"\]/g' /usr/local/share/gems/gems/fpm-*/lib/fpm/package/rpm.rb
|
||||
|
||||
# Generate RPM at startup
|
||||
VOLUME /data
|
||||
WORKDIR /usr/share/
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
--version %VERSION%
|
||||
--architecture %ARCH%
|
||||
--depends bash --depends python3 --depends 'nginx = 2:1.26.2' --depends 'nginx-mod-stream = 2:1.26.2' --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 tar
|
||||
--description "BunkerWeb %VERSION% for Fedora 41"
|
||||
--description "BunkerWeb %VERSION% for Fedora 40"
|
||||
--url "https://www.bunkerweb.io"
|
||||
--maintainer "Bunkerity <contact at bunkerity dot com>"
|
||||
--before-install /usr/share/bunkerweb/scripts/beforeInstall.sh
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e
|
||||
FROM fedora:40@sha256:7cdd2b48396929bb8723ea2fa60e03bee39cc22e2a853cbd891587fab4eb1bc9
|
||||
|
||||
ENV container=docker
|
||||
ENV NGINX_VERSION=1.26.2
|
||||
|
|
@ -21,7 +21,7 @@ RUN rm -f /lib/systemd/system/multi-user.target.wants/* \
|
|||
# Nginx
|
||||
RUN dnf update -y && \
|
||||
dnf install -y php-fpm curl gnupg2 ca-certificates redhat-lsb-core python3-pip which && \
|
||||
dnf install --enablerepo=updates-testing nginx-${NGINX_VERSION} -y
|
||||
dnf install nginx-${NGINX_VERSION} -y
|
||||
|
||||
COPY ./package-fedora/*.rpm /opt
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue