From 14d61854e515e76972ac29387f89579e9ffcd870 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Tue, 19 Jul 2022 16:48:58 +0200 Subject: [PATCH] add sudo to linux dependencies and curl to linux test images --- examples/authelia/setup-linux.sh | 2 +- linux/fpm-centos | 2 +- linux/fpm-debian | 2 +- linux/fpm-fedora | 2 +- linux/fpm-ubuntu | 2 +- tests/Dockerfile-centos | 2 +- tests/Dockerfile-debian | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/authelia/setup-linux.sh b/examples/authelia/setup-linux.sh index 34a3415b3..38e823eff 100755 --- a/examples/authelia/setup-linux.sh +++ b/examples/authelia/setup-linux.sh @@ -5,7 +5,7 @@ if [ $(id -u) -ne 0 ] ; then exit 1 fi -wget https://github.com/authelia/authelia/releases/download/v4.36.2/authelia-v4.36.2-linux-amd64.tar.gz -O /tmp/authelia.tar.gz +curl https://github.com/authelia/authelia/releases/download/v4.36.2/authelia-v4.36.2-linux-amd64.tar.gz -o /tmp/authelia.tar.gz cd /tmp/ tar -xvzf authelia.tar.gz mv authelia-linux-amd64 /usr/bin/authelia diff --git a/linux/fpm-centos b/linux/fpm-centos index b3f477fcc..8634279c8 100644 --- a/linux/fpm-centos +++ b/linux/fpm-centos @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.20.2-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd +--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.20.2-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --description "BunkerWeb %VERSION% for CentOS Stream 8" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/linux/fpm-debian b/linux/fpm-debian index 131245d71..a786d9f6c 100644 --- a/linux/fpm-debian +++ b/linux/fpm-debian @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture amd64 ---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 +--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 --depends sudo --description "BunkerWeb %VERSION% for Debian 11" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/linux/fpm-fedora b/linux/fpm-fedora index 34643e442..2d3d989f4 100644 --- a/linux/fpm-fedora +++ b/linux/fpm-fedora @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends python3 --depends 'nginx = 1:1.20.2-2.fc36' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd +--depends bash --depends python3 --depends 'nginx = 1:1.20.2-2.fc36' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --description "BunkerWeb %VERSION% for Fedora 36" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/linux/fpm-ubuntu b/linux/fpm-ubuntu index bd5030e57..0302d8817 100644 --- a/linux/fpm-ubuntu +++ b/linux/fpm-ubuntu @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture amd64 ---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 +--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 --depends sudo --description "BunkerWeb %VERSION% for Ubuntu 22.04" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/tests/Dockerfile-centos b/tests/Dockerfile-centos index 0a0e97825..bdae8898d 100644 --- a/tests/Dockerfile-centos +++ b/tests/Dockerfile-centos @@ -15,7 +15,7 @@ rm -f /lib/systemd/system/anaconda.target.wants/*; COPY linux/nginx.repo /etc/yum.repos.d/nginx.repo -RUN dnf install yum-utils epel-release -y && \ +RUN dnf install curl yum-utils epel-release -y && \ dnf install nginx-1.20.2 -y COPY ./packages/centos/*.rpm /opt diff --git a/tests/Dockerfile-debian b/tests/Dockerfile-debian index 2c91c1958..e6eb39703 100644 --- a/tests/Dockerfile-debian +++ b/tests/Dockerfile-debian @@ -24,7 +24,7 @@ RUN rm -f /lib/systemd/system/multi-user.target.wants/* \ /lib/systemd/system/systemd-update-utmp* RUN apt update && \ - apt-get install gnupg2 ca-certificates python3-pip -y && \ + apt-get install curl gnupg2 ca-certificates python3-pip -y && \ echo "deb https://nginx.org/packages/debian/ bullseye nginx" > /etc/apt/sources.list.d/nginx.list && \ echo "deb-src https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \