mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 00:43:34 +09:00
Compare commits
13 Commits
1.13.0-ls4
...
1.14.0-ls5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f54740dc0 | ||
|
|
d675686e17 | ||
|
|
7cb21be1d1 | ||
|
|
50b3c86a9e | ||
|
|
6217372efe | ||
|
|
8ff31a71c1 | ||
|
|
ff56929cf7 | ||
|
|
28cdf9b8c6 | ||
|
|
0ac5a2a4f2 | ||
|
|
36495ea204 | ||
|
|
a9be9a304f | ||
|
|
867da78277 | ||
|
|
c0f8b3a8b2 |
@@ -53,6 +53,7 @@ RUN \
|
||||
php7-exif \
|
||||
php7-ftp \
|
||||
php7-gd \
|
||||
php7-gmp \
|
||||
php7-iconv \
|
||||
php7-imap \
|
||||
php7-intl \
|
||||
@@ -68,6 +69,7 @@ RUN \
|
||||
php7-pdo_sqlite \
|
||||
php7-pear \
|
||||
php7-pecl-apcu \
|
||||
php7-pecl-mailparse \
|
||||
php7-pecl-redis \
|
||||
php7-pgsql \
|
||||
php7-phar \
|
||||
@@ -117,6 +119,7 @@ RUN \
|
||||
certbot-dns-rfc2136 \
|
||||
certbot-dns-route53 \
|
||||
certbot-dns-transip \
|
||||
certbot-dns-vultr \
|
||||
certbot-plugin-gandi \
|
||||
cryptography \
|
||||
requests && \
|
||||
|
||||
@@ -53,6 +53,7 @@ RUN \
|
||||
php7-exif \
|
||||
php7-ftp \
|
||||
php7-gd \
|
||||
php7-gmp \
|
||||
php7-iconv \
|
||||
php7-imap \
|
||||
php7-intl \
|
||||
@@ -68,6 +69,7 @@ RUN \
|
||||
php7-pdo_sqlite \
|
||||
php7-pear \
|
||||
php7-pecl-apcu \
|
||||
php7-pecl-mailparse \
|
||||
php7-pecl-redis \
|
||||
php7-pgsql \
|
||||
php7-phar \
|
||||
@@ -117,6 +119,7 @@ RUN \
|
||||
certbot-dns-rfc2136 \
|
||||
certbot-dns-route53 \
|
||||
certbot-dns-transip \
|
||||
certbot-dns-vultr \
|
||||
certbot-plugin-gandi \
|
||||
cryptography \
|
||||
requests && \
|
||||
|
||||
@@ -53,6 +53,7 @@ RUN \
|
||||
php7-exif \
|
||||
php7-ftp \
|
||||
php7-gd \
|
||||
php7-gmp \
|
||||
php7-iconv \
|
||||
php7-imap \
|
||||
php7-intl \
|
||||
@@ -68,6 +69,7 @@ RUN \
|
||||
php7-pdo_sqlite \
|
||||
php7-pear \
|
||||
php7-pecl-apcu \
|
||||
php7-pecl-mailparse \
|
||||
php7-pecl-redis \
|
||||
php7-pgsql \
|
||||
php7-phar \
|
||||
@@ -117,6 +119,7 @@ RUN \
|
||||
certbot-dns-rfc2136 \
|
||||
certbot-dns-route53 \
|
||||
certbot-dns-transip \
|
||||
certbot-dns-vultr \
|
||||
certbot-plugin-gandi \
|
||||
cryptography \
|
||||
requests && \
|
||||
|
||||
@@ -142,7 +142,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` and `transip`. 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`, `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). |
|
||||
@@ -326,6 +326,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **12.04.21:** - Add php7-gmp and php7-pecl-mailparse.
|
||||
* **12.04.21:** - Add support for vultr dns validation.
|
||||
* **14.03.21:** - Add support for directadmin dns validation.
|
||||
* **12.02.21:** - Clean up rust/cargo cache, which ballooned the image size in the last couple of builds.
|
||||
* **10.02.21:** - Fix aliyun, domeneshop, inwx and transip dns confs for existing users.
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
alpine-baselayout-3.2.0-r8
|
||||
alpine-keys-2.2-r0
|
||||
apache2-utils-2.4.46-r3
|
||||
apk-tools-2.12.1-r0
|
||||
apk-tools-2.12.4-r2
|
||||
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-r3
|
||||
busybox-1.32.1-r6
|
||||
c-client-2007f-r11
|
||||
ca-certificates-20191127-r5
|
||||
ca-certificates-bundle-20191127-r5
|
||||
coreutils-8.32-r2
|
||||
curl-7.74.0-r1
|
||||
curl-7.76.1-r0
|
||||
expat-2.2.10-r1
|
||||
fail2ban-0.11.1-r4
|
||||
freetype-2.10.4-r1
|
||||
@@ -34,8 +34,8 @@ libbsd-0.10.0-r0
|
||||
libbz2-1.0.8-r1
|
||||
libc-utils-0.7.2-r3
|
||||
libcap-2.46-r0
|
||||
libcrypto1.1-1.1.1j-r0
|
||||
libcurl-7.74.0-r1
|
||||
libcrypto1.1-1.1.1k-r0
|
||||
libcurl-7.76.1-r0
|
||||
libedit-20191231.3.1-r1
|
||||
libevent-2.1.12-r1
|
||||
libffi-3.3-r2
|
||||
@@ -62,11 +62,11 @@ 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-r0
|
||||
libseccomp-2.5.1-r1
|
||||
libsecret-0.20.4-r0
|
||||
libsm-1.2.3-r0
|
||||
libsodium-1.0.18-r0
|
||||
libssl1.1-1.1.1j-r0
|
||||
libssl1.1-1.1.1k-r0
|
||||
libstdc++-10.2.1_pre1-r3
|
||||
libtasn1-4.16.0-r1
|
||||
libtls-standalone-2.9.1-r1
|
||||
@@ -116,7 +116,7 @@ nginx-mod-stream-geoip2-1.18.0-r13
|
||||
nginx-vim-1.18.0-r13
|
||||
npth-1.6-r0
|
||||
oniguruma-6.9.6-r0
|
||||
openssl-1.1.1j-r0
|
||||
openssl-1.1.1k-r0
|
||||
p11-kit-0.23.22-r0
|
||||
pcre-8.44-r0
|
||||
pcre2-10.36-r0
|
||||
@@ -135,6 +135,7 @@ php7-fileinfo-7.4.15-r0
|
||||
php7-fpm-7.4.15-r0
|
||||
php7-ftp-7.4.15-r0
|
||||
php7-gd-7.4.15-r0
|
||||
php7-gmp-7.4.15-r0
|
||||
php7-iconv-7.4.15-r0
|
||||
php7-imap-7.4.15-r0
|
||||
php7-intl-7.4.15-r0
|
||||
@@ -153,9 +154,10 @@ php7-pdo_sqlite-7.4.15-r0
|
||||
php7-pear-7.4.15-r0
|
||||
php7-pecl-apcu-5.1.20-r0
|
||||
php7-pecl-igbinary-3.2.2_rc1-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.3-r0
|
||||
php7-pecl-redis-5.3.4-r0
|
||||
php7-pgsql-7.4.15-r0
|
||||
php7-phar-7.4.15-r0
|
||||
php7-posix-7.4.15-r0
|
||||
@@ -205,14 +207,14 @@ 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.7-r1
|
||||
python3-3.8.8-r0
|
||||
readline-8.1.0-r0
|
||||
s6-ipcserver-2.10.0.0-r0
|
||||
scanelf-1.2.8-r0
|
||||
shadow-4.8.1-r0
|
||||
skalibs-2.10.0.0-r0
|
||||
sqlite-libs-3.34.1-r0
|
||||
ssl_client-1.32.1-r3
|
||||
ssl_client-1.32.1-r6
|
||||
tzdata-2021a-r0
|
||||
unixodbc-2.3.9-r1
|
||||
utmps-0.1.0.0-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` and `transip`. 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`, `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,8 @@ app_setup_nginx_reverse_proxy_block: ""
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "12.04.21:", desc: "Add php7-gmp and php7-pecl-mailparse." }
|
||||
- { date: "12.04.21:", desc: "Add support for vultr dns validation." }
|
||||
- { date: "14.03.21:", desc: "Add support for directadmin dns validation." }
|
||||
- { date: "12.02.21:", desc: "Clean up rust/cargo cache, which ballooned the image size in the last couple of builds." }
|
||||
- { date: "10.02.21:", desc: "Fix aliyun, domeneshop, inwx and transip dns confs for existing users." }
|
||||
|
||||
3
root/defaults/dns-conf/vultr.ini
Normal file
3
root/defaults/dns-conf/vultr.ini
Normal file
@@ -0,0 +1,3 @@
|
||||
# Instructions: https://github.com/lezgomatt/certbot-dns-vultr
|
||||
# Replace with your vultr Personal Access Token (see https://www.vultr.com/docs/how-to-setup-dynamic-dns).
|
||||
dns_vultr_key = YOUR_VULTR_API_KEY
|
||||
@@ -99,7 +99,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)$ ]] && \
|
||||
[[ "$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)$ ]] && \
|
||||
echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
|
||||
sleep infinity
|
||||
|
||||
@@ -213,7 +213,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)$ ]]; then
|
||||
elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|hetzner|inwx|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