Compare commits

...

9 Commits

Author SHA1 Message Date
LinuxServer-CI
81e65837ca Bot Updating Package Versions 2024-08-07 12:08:32 +00:00
LinuxServer-CI
edf1abd83a Bot Updating Templated Files 2024-08-07 12:04:22 +00:00
driz
0357efea87 Merge pull request #491 from marblepebble/master
Fallback to iptables-legacy if iptables doesn't work
2024-08-07 08:01:42 -04:00
LinuxServer-CI
aa103ce997 Bot Updating Package Versions 2024-08-03 03:20:38 +00:00
marblepebble
20bbf040e0 Merge branch 'master' into master 2024-07-30 21:39:57 +01:00
Ainsley Pereira
e4a6e31b6f Add iptables-legacy to Dockerfile.aarch64 too 2024-07-30 21:24:12 +01:00
LinuxServer-CI
5b096a8a66 Bot Updating Package Versions 2024-07-27 03:22:59 +00:00
LinuxServer-CI
eb6dba6cbe Bot Updating Package Versions 2024-07-19 22:27:05 +00:00
Ainsley Pereira
625b11d21c Add iptables-legacy and fall back to it if the normal iptables command doesn't work. Fixes #476 2024-07-01 17:28:48 +01:00
6 changed files with 92 additions and 75 deletions

View File

@@ -27,6 +27,7 @@ RUN \
apk add --no-cache \
fail2ban \
gnupg \
iptables-legacy \
memcached \
nginx-mod-http-brotli \
nginx-mod-http-dav-ext \

View File

@@ -27,6 +27,7 @@ RUN \
apk add --no-cache \
fail2ban \
gnupg \
iptables-legacy \
memcached \
nginx-mod-http-brotli \
nginx-mod-http-dav-ext \

View File

@@ -401,6 +401,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **24.07.14:** - Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings.
* **01.07.24:** - Fall back to iptables-legacy if iptables doesn't work.
* **23.03.24:** - Fix perms on the generated `priv-fullchain-bundle.pem`.
* **14.03.24:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf - Update Authelia conf samples with support for 4.38.
* **11.03.24:** - Restore support for DynuDNS using `certbot-dns-dynudns`.

View File

@@ -1,32 +1,28 @@
NAME VERSION TYPE
ConfigArgParse 1.7 python
PyJWT 2.8.0 python
PyNamecheap 0.0.3 python
PyYAML 6.0.1 python
Simple Launcher 1.1.0.14 dotnet (+5 duplicates)
acme 2.11.0 python
alpine-baselayout 3.6.5-r0 apk
alpine-baselayout-data 3.6.5-r0 apk
alpine-keys 2.4-r1 apk
alpine-release 3.20.1-r0 apk
aom-libs 3.9.0-r0 apk
apache2-utils 2.4.61-r0 apk
alpine-release 3.20.2-r0 apk
aom-libs 3.9.1-r0 apk
apache2-utils 2.4.62-r0 apk
apk-tools 2.14.4-r0 apk
apr 1.7.4-r0 apk
apr-util 1.6.3-r1 apk
argon2-libs 20190702-r5 apk
attrs 23.2.0 python
attrs 24.2.0 python
autocommand 2.2.2 python
azure-common 1.1.28 python
azure-core 1.30.2 python
azure-identity 1.17.1 python
azure-mgmt-core 1.4.0 python
azure-mgmt-dns 8.1.0 python
backports.tarfile 1.2.0 python
backports-tarfile 1.2.0 python
bash 5.2.26-r0 apk
beautifulsoup4 4.12.3 python
boto3 1.34.145 python
botocore 1.34.145 python
boto3 1.34.155 python
botocore 1.34.155 python
brotli-libs 1.1.0-r2 apk
bs4 0.0.2 python
busybox 1.36.1-r29 apk
@@ -82,17 +78,18 @@ certbot-dns-transip 0.5.2 python
certbot-dns-vultr 1.1.0 python
certbot-plugin-gandi 1.5.0 python
certifi 2024.7.4 python
cffi 1.16.0 python
cffi 1.17.0 python
charset-normalizer 3.3.2 python
cloudflare 2.19.4 python
composer 2.7.7 binary
configargparse 1.7 python
configobj 5.0.8 python
coreutils 9.5-r1 apk
coreutils-env 9.5-r1 apk
coreutils-fmt 9.5-r1 apk
coreutils-sha512sum 9.5-r1 apk
cryptography 42.0.8 python
curl 8.8.0-r0 apk
cryptography 43.0.0 python
curl 8.9.0-r0 apk
distro 1.9.0 python
dns-lexicon 3.17.0 python
dnslib 0.9.25 python
@@ -119,8 +116,8 @@ gnupg-utils 2.4.5-r0 apk
gnupg-wks-client 2.4.5-r0 apk
gnutls 3.8.5-r0 apk
google-api-core 2.19.1 python
google-api-python-client 2.137.0 python
google-auth 2.32.0 python
google-api-python-client 2.140.0 python
google-auth 2.33.0 python
google-auth-httplib2 0.2.0 python
googleapis-common-protos 1.63.2 python
gpg 2.4.5-r0 apk
@@ -132,14 +129,15 @@ httplib2 0.22.0 python
icu-data-en 74.2-r0 apk
icu-libs 74.2-r0 apk
idna 3.7 python
importlib_metadata 8.0.0 python
importlib_resources 6.4.0 python
importlib-metadata 8.0.0 python
importlib-resources 6.4.0 python
inflect 7.3.1 python
iptables 1.8.10-r3 apk
iptables-legacy 1.8.10-r3 apk
isodate 0.6.1 python
jaraco.context 5.3.0 python
jaraco.functools 4.0.1 python
jaraco.text 3.12.1 python
jaraco-context 5.3.0 python
jaraco-functools 4.0.1 python
jaraco-text 3.12.1 python
jmespath 1.0.1 python
josepy 1.14.0 python
jq 1.7.1-r0 apk
@@ -152,7 +150,7 @@ libavif 1.0.4-r0 apk
libbsd 0.12.2-r0 apk
libbz2 1.0.8-r6 apk
libcrypto3 3.3.1-r3 apk
libcurl 8.8.0-r0 apk
libcurl 8.9.0-r0 apk
libdav1d 1.4.2-r0 apk
libedit 20240517.3.1-r0 apk
libevent 2.1.12-r7 apk
@@ -165,6 +163,8 @@ libgpg-error 1.49-r0 apk
libice 1.1.1-r6 apk
libidn2 2.3.7-r0 apk
libintl 0.22.5-r0 apk
libip4tc 1.8.10-r3 apk
libip6tc 1.8.10-r3 apk
libjpeg-turbo 3.0.3-r0 apk
libksba 1.6.6-r0 apk
libldap 2.6.7-r0 apk
@@ -252,73 +252,75 @@ pcre2 10.43-r0 apk
perl 5.38.2-r0 apk
perl-error 0.17029-r2 apk
perl-git 2.45.2-r0 apk
php83 8.3.9-r0 apk
php83-bcmath 8.3.9-r0 apk
php83-bz2 8.3.9-r0 apk
php83-common 8.3.9-r0 apk
php83-ctype 8.3.9-r0 apk
php83-curl 8.3.9-r0 apk
php83-dom 8.3.9-r0 apk
php83-exif 8.3.9-r0 apk
php83-fileinfo 8.3.9-r0 apk
php83-fpm 8.3.9-r0 apk
php83-ftp 8.3.9-r0 apk
php83-gd 8.3.9-r0 apk
php83-gmp 8.3.9-r0 apk
php83-iconv 8.3.9-r0 apk
php83-imap 8.3.9-r0 apk
php83-intl 8.3.9-r0 apk
php83-ldap 8.3.9-r0 apk
php83-mbstring 8.3.9-r0 apk
php83-mysqli 8.3.9-r0 apk
php83-mysqlnd 8.3.9-r0 apk
php83-opcache 8.3.9-r0 apk
php83-openssl 8.3.9-r0 apk
php83-pdo 8.3.9-r0 apk
php83-pdo_mysql 8.3.9-r0 apk
php83-pdo_odbc 8.3.9-r0 apk
php83-pdo_pgsql 8.3.9-r0 apk
php83-pdo_sqlite 8.3.9-r0 apk
php83-pear 8.3.9-r0 apk
php83 8.3.10-r0 apk
php83-bcmath 8.3.10-r0 apk
php83-bz2 8.3.10-r0 apk
php83-common 8.3.10-r0 apk
php83-ctype 8.3.10-r0 apk
php83-curl 8.3.10-r0 apk
php83-dom 8.3.10-r0 apk
php83-exif 8.3.10-r0 apk
php83-fileinfo 8.3.10-r0 apk
php83-fpm 8.3.10-r0 apk
php83-ftp 8.3.10-r0 apk
php83-gd 8.3.10-r0 apk
php83-gmp 8.3.10-r0 apk
php83-iconv 8.3.10-r0 apk
php83-imap 8.3.10-r0 apk
php83-intl 8.3.10-r0 apk
php83-ldap 8.3.10-r0 apk
php83-mbstring 8.3.10-r0 apk
php83-mysqli 8.3.10-r0 apk
php83-mysqlnd 8.3.10-r0 apk
php83-opcache 8.3.10-r0 apk
php83-openssl 8.3.10-r0 apk
php83-pdo 8.3.10-r0 apk
php83-pdo_mysql 8.3.10-r0 apk
php83-pdo_odbc 8.3.10-r0 apk
php83-pdo_pgsql 8.3.10-r0 apk
php83-pdo_sqlite 8.3.10-r0 apk
php83-pear 8.3.10-r0 apk
php83-pecl-apcu 5.1.23-r0 apk
php83-pecl-igbinary 3.2.15-r0 apk
php83-pecl-mcrypt 1.0.7-r0 apk
php83-pecl-memcached 3.2.0-r0 apk
php83-pecl-msgpack 2.2.0-r2 apk
php83-pecl-redis 6.0.2-r0 apk
php83-pgsql 8.3.9-r0 apk
php83-phar 8.3.9-r0 apk
php83-posix 8.3.9-r0 apk
php83-session 8.3.9-r0 apk
php83-simplexml 8.3.9-r0 apk
php83-soap 8.3.9-r0 apk
php83-sockets 8.3.9-r0 apk
php83-sodium 8.3.9-r0 apk
php83-sqlite3 8.3.9-r0 apk
php83-tokenizer 8.3.9-r0 apk
php83-xml 8.3.9-r0 apk
php83-xmlreader 8.3.9-r0 apk
php83-xmlwriter 8.3.9-r0 apk
php83-xsl 8.3.9-r0 apk
php83-zip 8.3.9-r0 apk
php83-pgsql 8.3.10-r0 apk
php83-phar 8.3.10-r0 apk
php83-posix 8.3.10-r0 apk
php83-session 8.3.10-r0 apk
php83-simplexml 8.3.10-r0 apk
php83-soap 8.3.10-r0 apk
php83-sockets 8.3.10-r0 apk
php83-sodium 8.3.10-r0 apk
php83-sqlite3 8.3.10-r0 apk
php83-tokenizer 8.3.10-r0 apk
php83-xml 8.3.10-r0 apk
php83-xmlreader 8.3.10-r0 apk
php83-xmlwriter 8.3.10-r0 apk
php83-xsl 8.3.10-r0 apk
php83-zip 8.3.10-r0 apk
pinentry 1.3.0-r0 apk
pip 24.1.2 python
pip 24.2 python
pkb-client 1.2 python
platformdirs 4.2.2 python
popt 1.19-r3 apk
portalocker 2.10.1 python
procps-ng 4.0.4-r0 apk
proto-plus 1.24.0 python
protobuf 5.27.2 python
pyOpenSSL 24.1.0 python
pyRFC3339 1.1 python
protobuf 5.27.3 python
pyacmedns 0.4 python
pyasn1 0.6.0 python
pyasn1_modules 0.4.0 python
pyasn1-modules 0.4.0 python
pyc 3.12.3-r1 apk
pycparser 2.22 python
pyjwt 2.9.0 python
pynamecheap 0.0.3 python
pyopenssl 24.2.1 python
pyotp 2.9.0 python
pyparsing 3.1.2 python
pyrfc3339 1.1 python
python-dateutil 2.9.0.post0 python
python-digitalocean 1.17.0 python
python-transip 0.6.0 python
@@ -326,6 +328,7 @@ python3 3.12.3-r1 apk
python3-pyc 3.12.3-r1 apk
python3-pycache-pyc0 3.12.3-r1 apk
pytz 2024.1 python
pyyaml 6.0.2 python
readline 8.2.10-r0 apk
requests 2.32.3 python
requests-file 2.1.0 python
@@ -333,7 +336,7 @@ requests-mock 1.12.1 python
rsa 4.9 python
s3transfer 0.10.2 python
scanelf 1.3.7-r2 apk
setuptools 71.0.3 python
setuptools 72.1.0 python
shadow 4.15.1-r0 apk
six 1.16.0 python
skalibs 2.14.1.1-r0 apk
@@ -344,16 +347,17 @@ tiff 4.6.0t-r0 apk
tldextract 5.1.2 python
tomli 2.0.1 python
typeguard 4.3.0 python
typing_extensions 4.12.2 python (+1 duplicate)
typing-extensions 4.12.2 python (+1 duplicate)
tzdata 2024a-r1 apk
unixodbc 2.3.12-r0 apk
uritemplate 4.1.1 python
urllib3 2.2.2 python
utmps-libs 0.1.2.2-r1 apk
wheel 0.43.0 python (+1 duplicate)
wheel 0.43.0 python
wheel 0.44.0 python
whois 5.5.23-r0 apk
xz-libs 5.6.1-r3 apk
xz-libs 5.6.2-r0 apk
zipp 3.19.2 python
zlib 1.3.1-r1 apk
zope.interface 6.4.post2 python
zope-interface 7.0.1 python
zstd-libs 1.5.6-r0 apk

View File

@@ -141,6 +141,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "24.07.14:", desc: "Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
- { date: "01.07.24:", desc: "Fall back to iptables-legacy if iptables doesn't work." }
- { date: "23.03.24:", desc: "Fix perms on the generated `priv-fullchain-bundle.pem`." }
- { date: "14.03.24:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf - Update Authelia conf samples with support for 4.38." }
- { date: "11.03.24:", desc: "Restore support for DynuDNS using `certbot-dns-dynudns`." }

View File

@@ -1,6 +1,15 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
if ! iptables -L &> /dev/null; then
ln -sf /sbin/xtables-legacy-multi /sbin/iptables
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-save
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-restore
fi
# copy/update the fail2ban config defaults to/in /config
cp -R /defaults/fail2ban/filter.d /config/fail2ban/
cp -R /defaults/fail2ban/action.d /config/fail2ban/