Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux - fix fedora NGINX version in Dockerfile, fix missing arg when building DEB/RPM and force NGINX version DEB deps

Browse Source
This commit is contained in:
bunkerity 2022-06-21 14:17:45 +02:00
parent 970082f92e
commit 3c417d2ff0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/Dockerfile-fedora
View File

@ -10,7 +10,7 @@ RUN dnf install -y ruby ruby-devel make gcc redhat-rpm-config rpm-build && \
# Nginx # Nginx
RUN dnf update -y && \ RUN dnf update -y && \
dnf install -y curl gnupg2 ca-certificates redhat-lsb-core && \ dnf install -y curl gnupg2 ca-certificates redhat-lsb-core && \
dnf install nginx -y dnf install nginx-1.20.2 -y
# Copy dependencies sources folder # Copy dependencies sources folder
COPY deps /tmp/bunkerweb/deps COPY deps /tmp/bunkerweb/deps

2
linux/fpm-debian
View File

@ -3,7 +3,7 @@
--license agpl3 --license agpl3
--version %VERSION% --version %VERSION%
--architecture amd64 --architecture amd64
--depends bash --depends python3 --depends python3-pip --depends 'nginx (>= 1.20.2)' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.20.2-1~bullseye' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools
--description "BunkerWeb %VERSION% for Debian 11" --description "BunkerWeb %VERSION% for Debian 11"
--url "https://www.bunkerweb.io" --url "https://www.bunkerweb.io"
--maintainer "Bunkerity <contact at bunkerity dot com>" --maintainer "Bunkerity <contact at bunkerity dot com>"

2
linux/fpm-ubuntu
View File

@ -3,7 +3,7 @@
--license agpl3 --license agpl3
--version %VERSION% --version %VERSION%
--architecture amd64 --architecture amd64
--depends bash --depends python3 --depends python3-pip --depends 'nginx (>= 1.20.2)' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.20.2-1~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools
--description "BunkerWeb %VERSION% for Ubuntu 22.04" --description "BunkerWeb %VERSION% for Ubuntu 22.04"
--url "https://www.bunkerweb.io" --url "https://www.bunkerweb.io"
--maintainer "Bunkerity <contact at bunkerity dot com>" --maintainer "Bunkerity <contact at bunkerity dot com>"

2
tests/linux.sh
View File

@ -11,7 +11,7 @@ function gen_package() {
else else
type="deb" type="deb"
fi fi
do_and_check_cmd docker run --rm -v "/tmp/packages/${linux}:/data" "bw-${linux}-tests:latest" do_and_check_cmd docker run --rm -v "/tmp/packages/${linux}:/data" "bw-${linux}-tests:latest" "$type"
name="bunkerweb_${version}-1_amd64" name="bunkerweb_${version}-1_amd64"
if [ "$type" = "rpm" ] ; then if [ "$type" = "rpm" ] ; then
name="bunkerweb-${version}-1.x86_64" name="bunkerweb-${version}-1.x86_64"