diff --git a/Dockerfile b/Dockerfile index 67ae1b7..19e2953 100755 --- a/Dockerfile +++ b/Dockerfile @@ -125,6 +125,7 @@ RUN \ certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ + certbot-dns-porkbun \ certbot-dns-rfc2136 \ certbot-dns-route53 \ certbot-dns-sakuracloud \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index eb62ee5..cd455f4 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -125,6 +125,7 @@ RUN \ certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ + certbot-dns-porkbun \ certbot-dns-rfc2136 \ certbot-dns-route53 \ certbot-dns-sakuracloud \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7b81199..1ac580e 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -125,6 +125,7 @@ RUN \ certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ + certbot-dns-porkbun \ certbot-dns-rfc2136 \ certbot-dns-route53 \ certbot-dns-sakuracloud \ diff --git a/README.md b/README.md old mode 100755 new mode 100644 index 3df037d..e1c89a6 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions * **09.02.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs. +* **06.02.23:** - Add porkbun support back in. * **21.01.23:** - Unpin certbot version (allow certbot 2.x). !!BREAKING CHANGE!! We are temporarily removing the certbot porkbun plugin until a new version is released that is compatible with certbot 2.x. * **20.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Remove nchan module because it keeps causing crashes. diff --git a/package_versions.txt b/package_versions.txt index 3450336..57b70aa 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,8 +5,8 @@ alpine-release-3.17.1-r0 aom-libs-3.5.0-r0 apache2-utils-2.4.55-r0 apk-tools-2.12.10-r1 -apr-1.7.0-r2 -apr-util-1.6.1-r14 +apr-1.7.2-r0 +apr-util-1.6.3-r0 argon2-libs-20190702-r2 bash-5.2.15-r0 brotli-libs-1.0.9-r9 @@ -47,7 +47,7 @@ libavif-0.11.1-r0 libbsd-0.11.7-r0 libbz2-1.0.8-r4 libc-utils-0.7.2-r3 -libcrypto3-3.0.7-r2 +libcrypto3-3.0.8-r0 libcurl-7.87.0-r1 libdav1d-1.0.0-r2 libedit-20221030.3.1-r0 @@ -77,13 +77,13 @@ libsasl-2.1.28-r3 libseccomp-2.5.4-r0 libsm-1.2.3-r1 libsodium-1.0.18-r2 -libssl3-3.0.7-r2 +libssl3-3.0.8-r0 libstdc++-12.2.1_git20220924-r4 libtasn1-4.19.0-r0 libunistring-1.1-r0 libuuid-2.38.1-r1 libwebp-1.2.4-r1 -libx11-1.8.3-r1 +libx11-1.8.4-r0 libxau-1.0.10-r0 libxcb-1.15-r0 libxdmcp-1.1.4-r0 @@ -126,41 +126,41 @@ nginx-mod-stream-geoip2-1.22.1-r0 nginx-vim-1.22.1-r0 npth-1.6-r2 oniguruma-6.9.8-r0 -openssl-3.0.7-r2 +openssl-3.0.8-r0 p11-kit-0.24.1-r1 pcre-8.45-r2 pcre2-10.42-r0 perl-5.36.0-r0 perl-error-0.17029-r1 perl-git-2.38.3-r1 -php81-8.1.14-r0 -php81-bcmath-8.1.14-r0 -php81-bz2-8.1.14-r0 -php81-common-8.1.14-r0 -php81-ctype-8.1.14-r0 -php81-curl-8.1.14-r0 -php81-dom-8.1.14-r0 -php81-exif-8.1.14-r0 -php81-fileinfo-8.1.14-r0 -php81-fpm-8.1.14-r0 -php81-ftp-8.1.14-r0 -php81-gd-8.1.14-r0 -php81-gmp-8.1.14-r0 -php81-iconv-8.1.14-r0 -php81-imap-8.1.14-r0 -php81-intl-8.1.14-r0 -php81-ldap-8.1.14-r0 -php81-mbstring-8.1.14-r0 -php81-mysqli-8.1.14-r0 -php81-mysqlnd-8.1.14-r0 -php81-opcache-8.1.14-r0 -php81-openssl-8.1.14-r0 -php81-pdo-8.1.14-r0 -php81-pdo_mysql-8.1.14-r0 -php81-pdo_odbc-8.1.14-r0 -php81-pdo_pgsql-8.1.14-r0 -php81-pdo_sqlite-8.1.14-r0 -php81-pear-8.1.14-r0 +php81-8.1.15-r0 +php81-bcmath-8.1.15-r0 +php81-bz2-8.1.15-r0 +php81-common-8.1.15-r0 +php81-ctype-8.1.15-r0 +php81-curl-8.1.15-r0 +php81-dom-8.1.15-r0 +php81-exif-8.1.15-r0 +php81-fileinfo-8.1.15-r0 +php81-fpm-8.1.15-r0 +php81-ftp-8.1.15-r0 +php81-gd-8.1.15-r0 +php81-gmp-8.1.15-r0 +php81-iconv-8.1.15-r0 +php81-imap-8.1.15-r0 +php81-intl-8.1.15-r0 +php81-ldap-8.1.15-r0 +php81-mbstring-8.1.15-r0 +php81-mysqli-8.1.15-r0 +php81-mysqlnd-8.1.15-r0 +php81-opcache-8.1.15-r0 +php81-openssl-8.1.15-r0 +php81-pdo-8.1.15-r0 +php81-pdo_mysql-8.1.15-r0 +php81-pdo_odbc-8.1.15-r0 +php81-pdo_pgsql-8.1.15-r0 +php81-pdo_sqlite-8.1.15-r0 +php81-pear-8.1.15-r0 php81-pecl-apcu-5.1.22-r0 php81-pecl-igbinary-3.2.12-r0 php81-pecl-mailparse-3.1.4-r0 @@ -168,25 +168,25 @@ php81-pecl-mcrypt-1.0.4-r0 php81-pecl-memcached-3.2.0-r0 php81-pecl-redis-5.3.7-r0 php81-pecl-xmlrpc-1.0.0_rc3-r0 -php81-pgsql-8.1.14-r0 -php81-phar-8.1.14-r0 -php81-posix-8.1.14-r0 -php81-session-8.1.14-r0 -php81-simplexml-8.1.14-r0 -php81-soap-8.1.14-r0 -php81-sockets-8.1.14-r0 -php81-sodium-8.1.14-r0 -php81-sqlite3-8.1.14-r0 -php81-tokenizer-8.1.14-r0 -php81-xml-8.1.14-r0 -php81-xmlreader-8.1.14-r0 -php81-xmlwriter-8.1.14-r0 -php81-xsl-8.1.14-r0 -php81-zip-8.1.14-r0 +php81-pgsql-8.1.15-r0 +php81-phar-8.1.15-r0 +php81-posix-8.1.15-r0 +php81-session-8.1.15-r0 +php81-simplexml-8.1.15-r0 +php81-soap-8.1.15-r0 +php81-sockets-8.1.15-r0 +php81-sodium-8.1.15-r0 +php81-sqlite3-8.1.15-r0 +php81-tokenizer-8.1.15-r0 +php81-xml-8.1.15-r0 +php81-xmlreader-8.1.15-r0 +php81-xmlwriter-8.1.15-r0 +php81-xsl-8.1.15-r0 +php81-zip-8.1.15-r0 pinentry-1.2.1-r0 popt-1.19-r0 procps-3.3.17-r2 -python3-3.10.9-r1 +python3-3.10.10-r0 readline-8.2.0-r0 scanelf-1.3.5-r1 shadow-4.13-r0 diff --git a/readme-vars.yml b/readme-vars.yml old mode 100755 new mode 100644 index 377b125..5c4f7f5 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -155,6 +155,7 @@ app_setup_block: | # changelog changelogs: - { date: "09.02.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs." } + - { date: "06.02.23:", desc: "Add porkbun support back in." } - { date: "21.01.23:", desc: "Unpin certbot version (allow certbot 2.x). !!BREAKING CHANGE!! We are temporarily removing the certbot porkbun plugin until a new version is released that is compatible with certbot 2.x." } - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Remove nchan module because it keeps causing crashes." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index 8d36c45..3ad4284 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -24,7 +24,7 @@ for i in "${SANED_VARS[@]}"; do done # check to make sure DNSPLUGIN is selected if dns validation is used -if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|duckdns|dynu|gandi|gehirn|godaddy|google|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then +if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|duckdns|dynu|gandi|gehirn|godaddy|google|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." sleep infinity fi