mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 00:43:34 +09:00
Compare commits
17 Commits
1.17.0-ls7
...
1.18.0-ls7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
093fadb043 | ||
|
|
4a6038f334 | ||
|
|
71be04a03f | ||
|
|
d19e63a447 | ||
|
|
1ae82126d8 | ||
|
|
44f30c7ae3 | ||
|
|
e4a5adec12 | ||
|
|
5a72468780 | ||
|
|
31190157fb | ||
|
|
d467a56034 | ||
|
|
e55894357e | ||
|
|
329d7e8f93 | ||
|
|
a2e3cfb521 | ||
|
|
899f6c96aa | ||
|
|
bff85f23d3 | ||
|
|
326e102f40 | ||
|
|
89714012c6 |
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -110,6 +110,7 @@ RUN \
|
||||
certbot-dns-google \
|
||||
certbot-dns-hetzner \
|
||||
certbot-dns-inwx \
|
||||
certbot-dns-ionos \
|
||||
certbot-dns-linode \
|
||||
certbot-dns-luadns \
|
||||
certbot-dns-netcup \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -110,6 +110,7 @@ RUN \
|
||||
certbot-dns-google \
|
||||
certbot-dns-hetzner \
|
||||
certbot-dns-inwx \
|
||||
certbot-dns-ionos \
|
||||
certbot-dns-linode \
|
||||
certbot-dns-luadns \
|
||||
certbot-dns-netcup \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -110,6 +110,7 @@ RUN \
|
||||
certbot-dns-google \
|
||||
certbot-dns-hetzner \
|
||||
certbot-dns-inwx \
|
||||
certbot-dns-ionos \
|
||||
certbot-dns-linode \
|
||||
certbot-dns-luadns \
|
||||
certbot-dns-netcup \
|
||||
|
||||
15
Jenkinsfile
vendored
15
Jenkinsfile
vendored
@@ -375,7 +375,9 @@ pipeline {
|
||||
// Build Docker container for push to LS Repo
|
||||
stage('Build-Single') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'false'
|
||||
expression {
|
||||
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -400,7 +402,10 @@ pipeline {
|
||||
// Build MultiArch Docker containers for push to LS Repo
|
||||
stage('Build-Multi') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
allOf {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
expression { params.PACKAGE_CHECK == 'false' }
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
parallel {
|
||||
@@ -505,7 +510,7 @@ pipeline {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
||||
@@ -566,7 +571,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "Packages were updated. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
@@ -590,7 +595,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "There are no package updates. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
|
||||
@@ -208,7 +208,7 @@ Container images are configured using parameters passed at runtime (such as thos
|
||||
| `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only) |
|
||||
| `-e VALIDATION=http` | Certbot validation method to use, options are `http`, `dns` or `duckdns` (`dns` method also requires `DNSPLUGIN` variable set) (`duckdns` method requires `DUCKDNSTOKEN` variable set, and the `SUBDOMAINS` variable must be either empty or set to `wildcard`). |
|
||||
| `-e CERTPROVIDER=` | Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt. |
|
||||
| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `hetzner`, `inwx`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
|
||||
| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
|
||||
| `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
|
||||
| `-e DUCKDNSTOKEN=` | Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org |
|
||||
| `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
|
||||
@@ -327,6 +327,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **01.08.21:** - Add support for ionos dns validation.
|
||||
* **15.07.21:** - Fix libmaxminddb issue due to upstream change.
|
||||
* **07.07.21:** - Rebase to alpine 3.14.
|
||||
* **24.06.21:** - Update default nginx conf folder.
|
||||
* **28.05.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`.
|
||||
* **20.05.21:** - Modify resolver.conf generation to detect and ignore ipv6.
|
||||
|
||||
@@ -1,225 +1,227 @@
|
||||
alpine-baselayout-3.2.0-r8
|
||||
alpine-keys-2.2-r0
|
||||
alpine-baselayout-3.2.0-r16
|
||||
alpine-keys-2.3-r1
|
||||
apache2-utils-2.4.48-r0
|
||||
apk-tools-2.12.5-r0
|
||||
apk-tools-2.12.7-r0
|
||||
apr-1.7.0-r0
|
||||
apr-util-1.6.1-r7
|
||||
argon2-libs-20190702-r1
|
||||
bash-5.1.0-r0
|
||||
brotli-libs-1.0.9-r3
|
||||
busybox-1.32.1-r6
|
||||
bash-5.1.4-r0
|
||||
brotli-libs-1.0.9-r5
|
||||
busybox-1.33.1-r3
|
||||
c-client-2007f-r11
|
||||
ca-certificates-20191127-r5
|
||||
ca-certificates-bundle-20191127-r5
|
||||
coreutils-8.32-r2
|
||||
curl-7.77.0-r1
|
||||
expat-2.2.10-r1
|
||||
fail2ban-0.11.1-r4
|
||||
curl-7.78.0-r0
|
||||
expat-2.4.1-r0
|
||||
fail2ban-0.11.2-r0
|
||||
freetype-2.10.4-r1
|
||||
gdbm-1.19-r0
|
||||
git-2.30.2-r0
|
||||
git-perl-2.30.2-r0
|
||||
glib-2.66.8-r0
|
||||
git-2.32.0-r0
|
||||
git-perl-2.32.0-r0
|
||||
glib-2.68.3-r0
|
||||
gmp-6.2.1-r0
|
||||
gnupg-2.2.27-r0
|
||||
gnutls-3.7.1-r0
|
||||
icu-libs-67.1-r2
|
||||
ip6tables-1.8.6-r0
|
||||
iptables-1.8.6-r0
|
||||
ip6tables-1.8.7-r1
|
||||
iptables-1.8.7-r1
|
||||
libacl-2.2.53-r0
|
||||
libassuan-2.5.4-r0
|
||||
libattr-2.4.48-r0
|
||||
libblkid-2.36.1-r1
|
||||
libbsd-0.10.0-r0
|
||||
libassuan-2.5.5-r0
|
||||
libattr-2.5.1-r0
|
||||
libblkid-2.37-r0
|
||||
libbsd-0.11.3-r0
|
||||
libbz2-1.0.8-r1
|
||||
libc-utils-0.7.2-r3
|
||||
libcap-2.46-r0
|
||||
libcrypto1.1-1.1.1k-r0
|
||||
libcurl-7.77.0-r1
|
||||
libedit-20191231.3.1-r1
|
||||
libevent-2.1.12-r1
|
||||
libcap-2.50-r0
|
||||
libcrypto1.1-1.1.1l-r0
|
||||
libcurl-7.78.0-r0
|
||||
libedit-20210216.3.1-r0
|
||||
libevent-2.1.12-r2
|
||||
libffi-3.3-r2
|
||||
libgcc-10.2.1_pre1-r3
|
||||
libgcrypt-1.8.8-r0
|
||||
libgd-2.3.0-r2
|
||||
libgpg-error-1.41-r0
|
||||
libgcc-10.3.1_git20210424-r2
|
||||
libgcrypt-1.9.3-r0
|
||||
libgd-2.3.2-r0
|
||||
libgpg-error-1.42-r0
|
||||
libice-1.0.10-r0
|
||||
libidn-1.35-r0
|
||||
libintl-0.20.2-r2
|
||||
libidn-1.37-r0
|
||||
libintl-0.21-r0
|
||||
libjpeg-turbo-2.1.0-r0
|
||||
libksba-1.5.0-r0
|
||||
libldap-2.4.57-r1
|
||||
libmagic-5.39-r0
|
||||
libmaxminddb-1.5.0-r1
|
||||
libksba-1.5.1-r0
|
||||
libldap-2.4.58-r0
|
||||
libmagic-5.40-r1
|
||||
libmaxminddb-1.5.2-r0
|
||||
libmcrypt-2.5.8-r9
|
||||
libmd-1.0.3-r0
|
||||
libmemcached-libs-1.0.18-r4
|
||||
libmnl-1.0.4-r1
|
||||
libmount-2.36.1-r1
|
||||
libnftnl-libs-1.1.8-r0
|
||||
libmount-2.37-r0
|
||||
libnftnl-libs-1.2.0-r0
|
||||
libpng-1.6.37-r1
|
||||
libpq-13.3-r0
|
||||
libproc-3.3.16-r0
|
||||
libressl3.1-libcrypto-3.1.5-r0
|
||||
libressl3.1-libssl-3.1.5-r0
|
||||
libsasl-2.1.27-r10
|
||||
libseccomp-2.5.1-r1
|
||||
libsecret-0.20.4-r0
|
||||
libpq-13.4-r0
|
||||
libproc-3.3.17-r0
|
||||
libressl3.3-libcrypto-3.3.3-r0
|
||||
libressl3.3-libssl-3.3.3-r0
|
||||
libretls-3.3.3p1-r2
|
||||
libsasl-2.1.27-r12
|
||||
libseccomp-2.5.1-r2
|
||||
libsecret-0.20.4-r1
|
||||
libsm-1.2.3-r0
|
||||
libsodium-1.0.18-r0
|
||||
libssl1.1-1.1.1k-r0
|
||||
libstdc++-10.2.1_pre1-r3
|
||||
libtasn1-4.16.0-r1
|
||||
libtls-standalone-2.9.1-r1
|
||||
libunistring-0.9.10-r0
|
||||
libuuid-2.36.1-r1
|
||||
libwebp-1.1.0-r0
|
||||
libx11-1.7.1-r0
|
||||
libssl1.1-1.1.1l-r0
|
||||
libstdc++-10.3.1_git20210424-r2
|
||||
libtasn1-4.17.0-r0
|
||||
libunistring-0.9.10-r1
|
||||
libuuid-2.37-r0
|
||||
libwebp-1.2.0-r2
|
||||
libx11-1.7.2-r0
|
||||
libxau-1.0.9-r0
|
||||
libxcb-1.14-r1
|
||||
libxcb-1.14-r2
|
||||
libxdmcp-1.1.3-r0
|
||||
libxext-1.3.4-r0
|
||||
libxml2-2.9.10-r7
|
||||
libxml2-2.9.12-r1
|
||||
libxpm-3.5.13-r0
|
||||
libxslt-1.1.34-r0
|
||||
libxslt-1.1.34-r1
|
||||
libxt-1.2.1-r0
|
||||
libzip-1.7.3-r2
|
||||
linux-pam-1.5.1-r0
|
||||
logrotate-3.18.0-r0
|
||||
lz4-libs-1.9.2-r0
|
||||
linux-pam-1.5.1-r1
|
||||
logrotate-3.18.1-r0
|
||||
lz4-libs-1.9.3-r0
|
||||
memcached-1.6.9-r0
|
||||
musl-1.2.2-r1
|
||||
musl-utils-1.2.2-r1
|
||||
nano-5.4-r3
|
||||
ncurses-libs-6.2_p20210109-r0
|
||||
ncurses-terminfo-base-6.2_p20210109-r0
|
||||
mpdecimal-2.5.1-r1
|
||||
musl-1.2.2-r3
|
||||
musl-utils-1.2.2-r3
|
||||
nano-5.7-r2
|
||||
ncurses-libs-6.2_p20210612-r0
|
||||
ncurses-terminfo-base-6.2_p20210612-r0
|
||||
nettle-3.7.2-r0
|
||||
nghttp2-libs-1.42.0-r1
|
||||
nginx-1.18.0-r15
|
||||
nginx-mod-devel-kit-1.18.0-r15
|
||||
nginx-mod-http-brotli-1.18.0-r15
|
||||
nginx-mod-http-dav-ext-1.18.0-r15
|
||||
nginx-mod-http-echo-1.18.0-r15
|
||||
nginx-mod-http-fancyindex-1.18.0-r15
|
||||
nginx-mod-http-geoip2-1.18.0-r15
|
||||
nginx-mod-http-headers-more-1.18.0-r15
|
||||
nginx-mod-http-image-filter-1.18.0-r15
|
||||
nginx-mod-http-nchan-1.18.0-r15
|
||||
nginx-mod-http-perl-1.18.0-r15
|
||||
nginx-mod-http-redis2-1.18.0-r15
|
||||
nginx-mod-http-set-misc-1.18.0-r15
|
||||
nginx-mod-http-upload-progress-1.18.0-r15
|
||||
nginx-mod-http-xslt-filter-1.18.0-r15
|
||||
nginx-mod-mail-1.18.0-r15
|
||||
nginx-mod-rtmp-1.18.0-r15
|
||||
nginx-mod-stream-1.18.0-r15
|
||||
nginx-mod-stream-geoip2-1.18.0-r15
|
||||
nginx-vim-1.18.0-r15
|
||||
nghttp2-libs-1.43.0-r0
|
||||
nginx-1.20.1-r3
|
||||
nginx-mod-devel-kit-1.20.1-r3
|
||||
nginx-mod-http-brotli-1.20.1-r3
|
||||
nginx-mod-http-dav-ext-1.20.1-r3
|
||||
nginx-mod-http-echo-1.20.1-r3
|
||||
nginx-mod-http-fancyindex-1.20.1-r3
|
||||
nginx-mod-http-geoip2-1.20.1-r3
|
||||
nginx-mod-http-headers-more-1.20.1-r3
|
||||
nginx-mod-http-image-filter-1.20.1-r3
|
||||
nginx-mod-http-nchan-1.20.1-r3
|
||||
nginx-mod-http-perl-1.20.1-r3
|
||||
nginx-mod-http-redis2-1.20.1-r3
|
||||
nginx-mod-http-set-misc-1.20.1-r3
|
||||
nginx-mod-http-upload-progress-1.20.1-r3
|
||||
nginx-mod-http-xslt-filter-1.20.1-r3
|
||||
nginx-mod-mail-1.20.1-r3
|
||||
nginx-mod-rtmp-1.20.1-r3
|
||||
nginx-mod-stream-1.20.1-r3
|
||||
nginx-mod-stream-geoip2-1.20.1-r3
|
||||
nginx-vim-1.20.1-r3
|
||||
npth-1.6-r0
|
||||
oniguruma-6.9.6-r0
|
||||
openssl-1.1.1k-r0
|
||||
oniguruma-6.9.7.1-r0
|
||||
openssl-1.1.1l-r0
|
||||
p11-kit-0.23.22-r0
|
||||
pcre-8.44-r0
|
||||
pcre2-10.36-r0
|
||||
perl-5.32.0-r0
|
||||
perl-5.32.1-r0
|
||||
perl-error-0.17029-r1
|
||||
perl-git-2.30.2-r0
|
||||
php7-7.4.19-r0
|
||||
php7-bcmath-7.4.19-r0
|
||||
php7-bz2-7.4.19-r0
|
||||
php7-common-7.4.19-r0
|
||||
php7-ctype-7.4.19-r0
|
||||
php7-curl-7.4.19-r0
|
||||
php7-dom-7.4.19-r0
|
||||
php7-exif-7.4.19-r0
|
||||
php7-fileinfo-7.4.19-r0
|
||||
php7-fpm-7.4.19-r0
|
||||
php7-ftp-7.4.19-r0
|
||||
php7-gd-7.4.19-r0
|
||||
php7-gmp-7.4.19-r0
|
||||
php7-iconv-7.4.19-r0
|
||||
php7-imap-7.4.19-r0
|
||||
php7-intl-7.4.19-r0
|
||||
php7-json-7.4.19-r0
|
||||
php7-ldap-7.4.19-r0
|
||||
php7-mbstring-7.4.19-r0
|
||||
php7-mysqli-7.4.19-r0
|
||||
php7-mysqlnd-7.4.19-r0
|
||||
php7-opcache-7.4.19-r0
|
||||
php7-openssl-7.4.19-r0
|
||||
php7-pdo-7.4.19-r0
|
||||
php7-pdo_mysql-7.4.19-r0
|
||||
php7-pdo_odbc-7.4.19-r0
|
||||
php7-pdo_pgsql-7.4.19-r0
|
||||
php7-pdo_sqlite-7.4.19-r0
|
||||
php7-pear-7.4.19-r0
|
||||
perl-git-2.32.0-r0
|
||||
php7-7.4.23-r0
|
||||
php7-bcmath-7.4.23-r0
|
||||
php7-bz2-7.4.23-r0
|
||||
php7-common-7.4.23-r0
|
||||
php7-ctype-7.4.23-r0
|
||||
php7-curl-7.4.23-r0
|
||||
php7-dom-7.4.23-r0
|
||||
php7-exif-7.4.23-r0
|
||||
php7-fileinfo-7.4.22-r0
|
||||
php7-fpm-7.4.22-r0
|
||||
php7-ftp-7.4.23-r0
|
||||
php7-gd-7.4.23-r0
|
||||
php7-gmp-7.4.23-r0
|
||||
php7-iconv-7.4.23-r0
|
||||
php7-imap-7.4.23-r0
|
||||
php7-intl-7.4.23-r0
|
||||
php7-json-7.4.23-r0
|
||||
php7-ldap-7.4.23-r0
|
||||
php7-mbstring-7.4.23-r0
|
||||
php7-mysqli-7.4.23-r0
|
||||
php7-mysqlnd-7.4.23-r0
|
||||
php7-opcache-7.4.23-r0
|
||||
php7-openssl-7.4.23-r0
|
||||
php7-pdo-7.4.23-r0
|
||||
php7-pdo_mysql-7.4.23-r0
|
||||
php7-pdo_odbc-7.4.23-r0
|
||||
php7-pdo_pgsql-7.4.23-r0
|
||||
php7-pdo_sqlite-7.4.23-r0
|
||||
php7-pear-7.4.23-r0
|
||||
php7-pecl-apcu-5.1.20-r0
|
||||
php7-pecl-igbinary-3.2.2-r0
|
||||
php7-pecl-igbinary-3.2.4-r0
|
||||
php7-pecl-mailparse-3.1.1-r1
|
||||
php7-pecl-mcrypt-1.0.4-r0
|
||||
php7-pecl-memcached-3.1.5-r2
|
||||
php7-pecl-redis-5.3.4-r0
|
||||
php7-pgsql-7.4.19-r0
|
||||
php7-phar-7.4.19-r0
|
||||
php7-posix-7.4.19-r0
|
||||
php7-session-7.4.19-r0
|
||||
php7-simplexml-7.4.19-r0
|
||||
php7-soap-7.4.19-r0
|
||||
php7-sockets-7.4.19-r0
|
||||
php7-sodium-7.4.19-r0
|
||||
php7-sqlite3-7.4.19-r0
|
||||
php7-tokenizer-7.4.19-r0
|
||||
php7-xml-7.4.19-r0
|
||||
php7-xmlreader-7.4.19-r0
|
||||
php7-xmlrpc-7.4.19-r0
|
||||
php7-xmlwriter-7.4.19-r0
|
||||
php7-xsl-7.4.19-r0
|
||||
php7-zip-7.4.19-r0
|
||||
php7-pgsql-7.4.23-r0
|
||||
php7-phar-7.4.23-r0
|
||||
php7-posix-7.4.23-r0
|
||||
php7-session-7.4.23-r0
|
||||
php7-simplexml-7.4.22-r0
|
||||
php7-soap-7.4.23-r0
|
||||
php7-sockets-7.4.23-r0
|
||||
php7-sodium-7.4.23-r0
|
||||
php7-sqlite3-7.4.23-r0
|
||||
php7-tokenizer-7.4.23-r0
|
||||
php7-xml-7.4.23-r0
|
||||
php7-xmlreader-7.4.23-r0
|
||||
php7-xmlrpc-7.4.23-r0
|
||||
php7-xmlwriter-7.4.22-r0
|
||||
php7-xsl-7.4.23-r0
|
||||
php7-zip-7.4.23-r0
|
||||
pinentry-1.1.1-r0
|
||||
popt-1.18-r0
|
||||
procps-3.3.16-r0
|
||||
py3-appdirs-1.4.4-r1
|
||||
py3-asn1crypto-1.4.0-r0
|
||||
py3-cachecontrol-0.12.6-r0
|
||||
py3-cffi-1.14.4-r0
|
||||
py3-chardet-4.0.0-r0
|
||||
py3-colorama-0.4.4-r0
|
||||
py3-contextlib2-0.6.0-r0
|
||||
py3-cparser-2.20-r0
|
||||
py3-cryptography-3.3.2-r0
|
||||
py3-distlib-0.3.1-r1
|
||||
py3-distro-1.5.0-r1
|
||||
py3-future-0.18.2-r1
|
||||
py3-html5lib-1.1-r0
|
||||
py3-idna-3.1-r0
|
||||
py3-lockfile-0.12.2-r3
|
||||
py3-msgpack-1.0.2-r0
|
||||
py3-ordered-set-4.0.2-r0
|
||||
py3-packaging-20.9-r0
|
||||
py3-parsing-2.4.7-r1
|
||||
py3-pep517-0.9.1-r0
|
||||
py3-pip-20.3.4-r0
|
||||
py3-progress-1.5-r0
|
||||
py3-pytoml-0.1.21-r0
|
||||
py3-requests-2.25.1-r1
|
||||
py3-retrying-1.3.3-r0
|
||||
py3-setuptools-51.3.3-r0
|
||||
py3-six-1.15.0-r0
|
||||
py3-toml-0.10.2-r0
|
||||
py3-urllib3-1.26.2-r1
|
||||
py3-webencodings-0.5.1-r3
|
||||
python3-3.8.10-r0
|
||||
procps-3.3.17-r0
|
||||
py3-appdirs-1.4.4-r2
|
||||
py3-asn1crypto-1.4.0-r1
|
||||
py3-cachecontrol-0.12.6-r1
|
||||
py3-certifi-2020.12.5-r1
|
||||
py3-cffi-1.14.5-r1
|
||||
py3-chardet-4.0.0-r2
|
||||
py3-colorama-0.4.4-r1
|
||||
py3-contextlib2-0.6.0-r1
|
||||
py3-cparser-2.20-r1
|
||||
py3-cryptography-3.3.2-r1
|
||||
py3-distlib-0.3.1-r3
|
||||
py3-distro-1.5.0-r3
|
||||
py3-future-0.18.2-r3
|
||||
py3-html5lib-1.1-r1
|
||||
py3-idna-3.2-r0
|
||||
py3-lockfile-0.12.2-r4
|
||||
py3-msgpack-1.0.2-r1
|
||||
py3-ordered-set-4.0.2-r1
|
||||
py3-packaging-20.9-r1
|
||||
py3-parsing-2.4.7-r2
|
||||
py3-pep517-0.10.0-r2
|
||||
py3-pip-20.3.4-r1
|
||||
py3-progress-1.5-r2
|
||||
py3-requests-2.25.1-r4
|
||||
py3-retrying-1.3.3-r1
|
||||
py3-setuptools-52.0.0-r3
|
||||
py3-six-1.15.0-r1
|
||||
py3-toml-0.10.2-r2
|
||||
py3-urllib3-1.26.5-r0
|
||||
py3-webencodings-0.5.1-r4
|
||||
python3-3.9.5-r1
|
||||
readline-8.1.0-r0
|
||||
s6-ipcserver-2.10.0.0-r0
|
||||
scanelf-1.2.8-r0
|
||||
s6-ipcserver-2.10.0.3-r0
|
||||
scanelf-1.3.2-r0
|
||||
shadow-4.8.1-r0
|
||||
skalibs-2.10.0.0-r0
|
||||
sqlite-libs-3.34.1-r0
|
||||
ssl_client-1.32.1-r6
|
||||
skalibs-2.10.0.3-r0
|
||||
sqlite-libs-3.35.5-r0
|
||||
ssl_client-1.33.1-r3
|
||||
tzdata-2021a-r0
|
||||
unixodbc-2.3.9-r1
|
||||
utmps-0.1.0.0-r0
|
||||
whois-5.5.7-r1
|
||||
utmps-0.1.0.2-r0
|
||||
whois-5.5.10-r0
|
||||
xz-5.2.5-r0
|
||||
xz-libs-5.2.5-r0
|
||||
zlib-1.2.11-r3
|
||||
zstd-libs-1.4.9-r0
|
||||
zstd-libs-1.4.9-r1
|
||||
|
||||
@@ -51,7 +51,7 @@ cap_add_param_vars:
|
||||
opt_param_usage_include_env: true
|
||||
opt_param_env_vars:
|
||||
- { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." }
|
||||
- { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `hetzner`, `inwx`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
|
||||
- { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
|
||||
- { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
|
||||
- { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" }
|
||||
- { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
|
||||
@@ -151,6 +151,9 @@ app_setup_nginx_reverse_proxy_block: ""
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "01.08.21:", desc: "Add support for ionos dns validation." }
|
||||
- { date: "15.07.21:", desc: "Fix libmaxminddb issue due to upstream change." }
|
||||
- { date: "07.07.21:", desc: "Rebase to alpine 3.14." }
|
||||
- { date: "24.06.21:", desc: "Update default nginx conf folder." }
|
||||
- { date: "28.05.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`." }
|
||||
- { date: "20.05.21:", desc: "Modify resolver.conf generation to detect and ignore ipv6." }
|
||||
|
||||
5
root/defaults/dns-conf/ionos.ini
Normal file
5
root/defaults/dns-conf/ionos.ini
Normal file
@@ -0,0 +1,5 @@
|
||||
# Instructions: https://github.com/helgeerbe/certbot-dns-ionos
|
||||
# Replace with your values
|
||||
dns_ionos_prefix = myapikeyprefix
|
||||
dns_ionos_secret = verysecureapikeysecret
|
||||
dns_ionos_endpoint = https://api.hosting.ionos.com
|
||||
@@ -122,7 +122,7 @@ if ! grep -q 'PARAMETERS' "/config/nginx/dhparams.pem"; then
|
||||
fi
|
||||
|
||||
# check to make sure DNSPLUGIN is selected if dns validation is used
|
||||
[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|hetzner|inwx|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \
|
||||
[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \
|
||||
echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
|
||||
sleep infinity
|
||||
|
||||
@@ -236,7 +236,7 @@ if [ "$VALIDATION" = "dns" ]; then
|
||||
elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then
|
||||
if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
|
||||
PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}"
|
||||
elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|hetzner|inwx|netcup|njalla|transip|vultr)$ ]]; then
|
||||
elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
|
||||
if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
|
||||
PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}"
|
||||
elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then
|
||||
@@ -355,7 +355,7 @@ fi
|
||||
ln -s /config/geoip2db /var/lib/libmaxminddb
|
||||
# check GeoIP2 database
|
||||
if [ -n "$MAXMINDDB_LICENSE_KEY" ]; then
|
||||
sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/conf.d/libmaxminddb
|
||||
sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/libmaxminddb.cron.conf
|
||||
if [ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
|
||||
echo "Downloading GeoIP2 City database."
|
||||
/etc/periodic/weekly/libmaxminddb
|
||||
|
||||
Reference in New Issue
Block a user