mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 00:43:34 +09:00
Compare commits
7 Commits
1.17.0-ls7
...
1.18.0-ls7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71be04a03f | ||
|
|
d19e63a447 | ||
|
|
1ae82126d8 | ||
|
|
44f30c7ae3 | ||
|
|
e4a5adec12 | ||
|
|
5a72468780 | ||
|
|
31190157fb |
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
9
Jenkinsfile
vendored
9
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 {
|
||||
|
||||
@@ -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,7 @@ 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.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
alpine-baselayout-3.2.0-r16
|
||||
alpine-keys-2.3-r1
|
||||
apache2-utils-2.4.48-r0
|
||||
apk-tools-2.12.5-r1
|
||||
apk-tools-2.12.7-r0
|
||||
apr-1.7.0-r0
|
||||
apr-util-1.6.1-r7
|
||||
argon2-libs-20190702-r1
|
||||
@@ -34,7 +34,7 @@ libbsd-0.11.3-r0
|
||||
libbz2-1.0.8-r1
|
||||
libc-utils-0.7.2-r3
|
||||
libcap-2.50-r0
|
||||
libcrypto1.1-1.1.1k-r0
|
||||
libcrypto1.1-1.1.1l-r0
|
||||
libcurl-7.78.0-r0
|
||||
libedit-20210216.3.1-r0
|
||||
libevent-2.1.12-r2
|
||||
@@ -58,17 +58,17 @@ libmnl-1.0.4-r1
|
||||
libmount-2.37-r0
|
||||
libnftnl-libs-1.2.0-r0
|
||||
libpng-1.6.37-r1
|
||||
libpq-13.3-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.3-r2
|
||||
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
|
||||
libssl1.1-1.1.1l-r0
|
||||
libstdc++-10.3.1_git20210424-r2
|
||||
libtasn1-4.17.0-r0
|
||||
libunistring-0.9.10-r1
|
||||
@@ -125,57 +125,57 @@ pcre2-10.36-r0
|
||||
perl-5.32.1-r0
|
||||
perl-error-0.17029-r1
|
||||
perl-git-2.32.0-r0
|
||||
php7-7.4.21-r0
|
||||
php7-bcmath-7.4.21-r0
|
||||
php7-bz2-7.4.21-r0
|
||||
php7-common-7.4.21-r0
|
||||
php7-ctype-7.4.21-r0
|
||||
php7-curl-7.4.21-r0
|
||||
php7-dom-7.4.21-r0
|
||||
php7-exif-7.4.21-r0
|
||||
php7-fileinfo-7.4.21-r0
|
||||
php7-fpm-7.4.21-r0
|
||||
php7-ftp-7.4.21-r0
|
||||
php7-gd-7.4.21-r0
|
||||
php7-gmp-7.4.21-r0
|
||||
php7-iconv-7.4.21-r0
|
||||
php7-imap-7.4.21-r0
|
||||
php7-intl-7.4.21-r0
|
||||
php7-json-7.4.21-r0
|
||||
php7-ldap-7.4.21-r0
|
||||
php7-mbstring-7.4.21-r0
|
||||
php7-mysqli-7.4.21-r0
|
||||
php7-mysqlnd-7.4.21-r0
|
||||
php7-opcache-7.4.21-r0
|
||||
php7-openssl-7.4.21-r0
|
||||
php7-pdo-7.4.21-r0
|
||||
php7-pdo_mysql-7.4.21-r0
|
||||
php7-pdo_odbc-7.4.21-r0
|
||||
php7-pdo_pgsql-7.4.21-r0
|
||||
php7-pdo_sqlite-7.4.21-r0
|
||||
php7-pear-7.4.21-r0
|
||||
php7-7.4.22-r0
|
||||
php7-bcmath-7.4.22-r0
|
||||
php7-bz2-7.4.22-r0
|
||||
php7-common-7.4.22-r0
|
||||
php7-ctype-7.4.22-r0
|
||||
php7-curl-7.4.22-r0
|
||||
php7-dom-7.4.22-r0
|
||||
php7-exif-7.4.22-r0
|
||||
php7-fileinfo-7.4.22-r0
|
||||
php7-fpm-7.4.22-r0
|
||||
php7-ftp-7.4.22-r0
|
||||
php7-gd-7.4.22-r0
|
||||
php7-gmp-7.4.22-r0
|
||||
php7-iconv-7.4.22-r0
|
||||
php7-imap-7.4.22-r0
|
||||
php7-intl-7.4.22-r0
|
||||
php7-json-7.4.22-r0
|
||||
php7-ldap-7.4.22-r0
|
||||
php7-mbstring-7.4.22-r0
|
||||
php7-mysqli-7.4.22-r0
|
||||
php7-mysqlnd-7.4.22-r0
|
||||
php7-opcache-7.4.22-r0
|
||||
php7-openssl-7.4.22-r0
|
||||
php7-pdo-7.4.22-r0
|
||||
php7-pdo_mysql-7.4.22-r0
|
||||
php7-pdo_odbc-7.4.22-r0
|
||||
php7-pdo_pgsql-7.4.22-r0
|
||||
php7-pdo_sqlite-7.4.22-r0
|
||||
php7-pear-7.4.22-r0
|
||||
php7-pecl-apcu-5.1.20-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.21-r0
|
||||
php7-phar-7.4.21-r0
|
||||
php7-posix-7.4.21-r0
|
||||
php7-session-7.4.21-r0
|
||||
php7-simplexml-7.4.21-r0
|
||||
php7-soap-7.4.21-r0
|
||||
php7-sockets-7.4.21-r0
|
||||
php7-sodium-7.4.21-r0
|
||||
php7-sqlite3-7.4.21-r0
|
||||
php7-tokenizer-7.4.21-r0
|
||||
php7-xml-7.4.21-r0
|
||||
php7-xmlreader-7.4.21-r0
|
||||
php7-xmlrpc-7.4.21-r0
|
||||
php7-xmlwriter-7.4.21-r0
|
||||
php7-xsl-7.4.21-r0
|
||||
php7-zip-7.4.21-r0
|
||||
php7-pgsql-7.4.22-r0
|
||||
php7-phar-7.4.22-r0
|
||||
php7-posix-7.4.22-r0
|
||||
php7-session-7.4.22-r0
|
||||
php7-simplexml-7.4.22-r0
|
||||
php7-soap-7.4.22-r0
|
||||
php7-sockets-7.4.22-r0
|
||||
php7-sodium-7.4.22-r0
|
||||
php7-sqlite3-7.4.22-r0
|
||||
php7-tokenizer-7.4.22-r0
|
||||
php7-xml-7.4.22-r0
|
||||
php7-xmlreader-7.4.22-r0
|
||||
php7-xmlrpc-7.4.22-r0
|
||||
php7-xmlwriter-7.4.22-r0
|
||||
php7-xsl-7.4.22-r0
|
||||
php7-zip-7.4.22-r0
|
||||
pinentry-1.1.1-r0
|
||||
popt-1.18-r0
|
||||
procps-3.3.17-r0
|
||||
|
||||
@@ -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,7 @@ 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." }
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user