mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-13 05:35:16 +09:00
Compare commits
77 Commits
2.6.0-ls20
...
2.6.0-ls23
| Author | SHA1 | Date | |
|---|---|---|---|
|
cab0b86b65 | ||
|
4d3875d37e | ||
|
|
badea52047 | ||
|
|
97baf76a10 | ||
|
|
6ed02e1e00 | ||
|
|
a6778ab7c7 | ||
|
|
95c791acfc | ||
|
|
42ccafc064 | ||
|
|
6b7cdb26f1 | ||
|
e19a030eff | ||
|
|
4d4cb0ca74 | ||
|
|
9554582962 | ||
|
|
42ebe4a584 | ||
|
|
b9f5763ee5 | ||
|
|
2b0bf5869c | ||
|
|
b46830f214 | ||
|
|
66a8694772 | ||
|
|
33568e1bd3 | ||
|
|
0004cd1ce8 | ||
|
8dbd50ac06 | ||
|
|
cae42496e2 | ||
|
|
2f8c5b4487 | ||
|
|
9f75c7a713 | ||
|
|
262c1013aa | ||
|
|
54e4cfa047 | ||
|
|
97ba6a7de9 | ||
|
|
f11a753445 | ||
|
|
ee6153c817 | ||
|
|
93424877a9 | ||
|
|
eaf8b3648b | ||
|
|
b754cedda2 | ||
|
|
0d05560652 | ||
|
|
7f9b637353 | ||
|
|
675d67bbd4 | ||
|
|
402d513115 | ||
|
|
fac669ea43 | ||
|
|
3aab75dc8b | ||
|
|
b2e8d8c8ab | ||
|
973abbefbb | ||
|
|
dede63fdcf | ||
|
|
bee6793d45 | ||
|
|
29e9daa606 | ||
|
|
57c0d1f81e | ||
|
|
416bef8a2e | ||
|
|
500d5606e4 | ||
|
|
500fd0c634 | ||
|
|
adf38bcd2b | ||
|
|
5255b117f9 | ||
|
|
d7a8d6cc6a | ||
|
|
d67459e852 | ||
|
|
0ddb5be5f5 | ||
|
|
60f6fafc53 | ||
|
|
d5c530af49 | ||
|
|
be215d62aa | ||
|
|
db54dfaf71 | ||
|
|
0d70436ddb | ||
|
|
49d848b639 | ||
|
|
2df15e7b96 | ||
|
|
7a6c539527 | ||
|
|
230ad93b35 | ||
|
|
cc3e0b590e | ||
|
|
f9a5348035 | ||
|
|
ba685e7fd0 | ||
|
|
97782cdbed | ||
|
|
38bbfb2d01 | ||
|
|
9d695718f0 | ||
|
|
908571dea8 | ||
|
|
d7e2455e7a | ||
|
|
ebd233860e | ||
|
|
5fb909d7dc | ||
|
|
fd6d8764a2 | ||
|
|
ab7c85e4de | ||
|
|
d60847483d | ||
|
|
53bb2e284f | ||
|
|
43e50ffb03 | ||
|
|
18019fb216 | ||
|
|
d57dffef82 |
1
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
1
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
@@ -53,7 +53,6 @@ body:
|
|||||||
options:
|
options:
|
||||||
- x86-64
|
- x86-64
|
||||||
- arm64
|
- arm64
|
||||||
- armhf
|
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
- type: textarea
|
- type: textarea
|
||||||
|
|||||||
82
Dockerfile
82
Dockerfile
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
|
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@@ -24,7 +24,7 @@ RUN \
|
|||||||
openssl-dev \
|
openssl-dev \
|
||||||
python3-dev && \
|
python3-dev && \
|
||||||
echo "**** install runtime packages ****" && \
|
echo "**** install runtime packages ****" && \
|
||||||
apk add --no-cache --upgrade \
|
apk add --no-cache \
|
||||||
fail2ban \
|
fail2ban \
|
||||||
gnupg \
|
gnupg \
|
||||||
memcached \
|
memcached \
|
||||||
@@ -45,59 +45,53 @@ RUN \
|
|||||||
nginx-mod-stream \
|
nginx-mod-stream \
|
||||||
nginx-mod-stream-geoip2 \
|
nginx-mod-stream-geoip2 \
|
||||||
nginx-vim \
|
nginx-vim \
|
||||||
php81-bcmath \
|
php82-bcmath \
|
||||||
php81-bz2 \
|
php82-bz2 \
|
||||||
php81-ctype \
|
php82-dom \
|
||||||
php81-curl \
|
php82-exif \
|
||||||
php81-dom \
|
php82-ftp \
|
||||||
php81-exif \
|
php82-gd \
|
||||||
php81-ftp \
|
php82-gmp \
|
||||||
php81-gd \
|
php82-imap \
|
||||||
php81-gmp \
|
php82-intl \
|
||||||
php81-iconv \
|
php82-ldap \
|
||||||
php81-imap \
|
php82-mysqli \
|
||||||
php81-intl \
|
php82-mysqlnd \
|
||||||
php81-ldap \
|
php82-opcache \
|
||||||
php81-mysqli \
|
php82-pdo_mysql \
|
||||||
php81-mysqlnd \
|
php82-pdo_odbc \
|
||||||
php81-opcache \
|
php82-pdo_pgsql \
|
||||||
php81-pdo_mysql \
|
php82-pdo_sqlite \
|
||||||
php81-pdo_odbc \
|
php82-pear \
|
||||||
php81-pdo_pgsql \
|
php82-pecl-apcu \
|
||||||
php81-pdo_sqlite \
|
php82-pecl-memcached \
|
||||||
php81-pear \
|
php82-pecl-redis \
|
||||||
php81-pecl-apcu \
|
php82-pgsql \
|
||||||
php81-pecl-mailparse \
|
php82-posix \
|
||||||
php81-pecl-memcached \
|
php82-soap \
|
||||||
php81-pecl-redis \
|
php82-sockets \
|
||||||
php81-pgsql \
|
php82-sodium \
|
||||||
php81-phar \
|
php82-sqlite3 \
|
||||||
php81-posix \
|
php82-tokenizer \
|
||||||
php81-soap \
|
php82-xmlreader \
|
||||||
php81-sockets \
|
php82-xsl \
|
||||||
php81-sodium \
|
|
||||||
php81-sqlite3 \
|
|
||||||
php81-tokenizer \
|
|
||||||
php81-xmlreader \
|
|
||||||
php81-xsl \
|
|
||||||
php81-zip \
|
|
||||||
whois && \
|
whois && \
|
||||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||||
php81-pecl-mcrypt \
|
php82-pecl-mcrypt && \
|
||||||
php81-pecl-xmlrpc && \
|
|
||||||
echo "**** install certbot plugins ****" && \
|
echo "**** install certbot plugins ****" && \
|
||||||
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
||||||
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
|
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
|
||||||
fi && \
|
fi && \
|
||||||
python3 -m ensurepip && \
|
python3 -m venv /lsiopy && \
|
||||||
pip3 install -U --no-cache-dir \
|
pip install -U --no-cache-dir \
|
||||||
pip \
|
pip \
|
||||||
wheel && \
|
wheel && \
|
||||||
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
|
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
|
||||||
certbot==${CERTBOT_VERSION} \
|
certbot==${CERTBOT_VERSION} \
|
||||||
certbot-dns-acmedns \
|
certbot-dns-acmedns \
|
||||||
certbot-dns-aliyun \
|
certbot-dns-aliyun \
|
||||||
certbot-dns-azure \
|
certbot-dns-azure \
|
||||||
|
certbot-dns-bunny \
|
||||||
certbot-dns-cloudflare \
|
certbot-dns-cloudflare \
|
||||||
certbot-dns-cpanel \
|
certbot-dns-cpanel \
|
||||||
certbot-dns-desec \
|
certbot-dns-desec \
|
||||||
@@ -108,8 +102,10 @@ RUN \
|
|||||||
certbot-dns-dnspod \
|
certbot-dns-dnspod \
|
||||||
certbot-dns-do \
|
certbot-dns-do \
|
||||||
certbot-dns-domeneshop \
|
certbot-dns-domeneshop \
|
||||||
|
certbot-dns-dreamhost \
|
||||||
certbot-dns-duckdns \
|
certbot-dns-duckdns \
|
||||||
certbot-dns-dynu \
|
certbot-dns-dynu \
|
||||||
|
certbot-dns-freedns \
|
||||||
certbot-dns-gehirn \
|
certbot-dns-gehirn \
|
||||||
certbot-dns-godaddy \
|
certbot-dns-godaddy \
|
||||||
certbot-dns-google \
|
certbot-dns-google \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
|
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@@ -24,7 +24,7 @@ RUN \
|
|||||||
openssl-dev \
|
openssl-dev \
|
||||||
python3-dev && \
|
python3-dev && \
|
||||||
echo "**** install runtime packages ****" && \
|
echo "**** install runtime packages ****" && \
|
||||||
apk add --no-cache --upgrade \
|
apk add --no-cache \
|
||||||
fail2ban \
|
fail2ban \
|
||||||
gnupg \
|
gnupg \
|
||||||
memcached \
|
memcached \
|
||||||
@@ -45,59 +45,53 @@ RUN \
|
|||||||
nginx-mod-stream \
|
nginx-mod-stream \
|
||||||
nginx-mod-stream-geoip2 \
|
nginx-mod-stream-geoip2 \
|
||||||
nginx-vim \
|
nginx-vim \
|
||||||
php81-bcmath \
|
php82-bcmath \
|
||||||
php81-bz2 \
|
php82-bz2 \
|
||||||
php81-ctype \
|
php82-dom \
|
||||||
php81-curl \
|
php82-exif \
|
||||||
php81-dom \
|
php82-ftp \
|
||||||
php81-exif \
|
php82-gd \
|
||||||
php81-ftp \
|
php82-gmp \
|
||||||
php81-gd \
|
php82-imap \
|
||||||
php81-gmp \
|
php82-intl \
|
||||||
php81-iconv \
|
php82-ldap \
|
||||||
php81-imap \
|
php82-mysqli \
|
||||||
php81-intl \
|
php82-mysqlnd \
|
||||||
php81-ldap \
|
php82-opcache \
|
||||||
php81-mysqli \
|
php82-pdo_mysql \
|
||||||
php81-mysqlnd \
|
php82-pdo_odbc \
|
||||||
php81-opcache \
|
php82-pdo_pgsql \
|
||||||
php81-pdo_mysql \
|
php82-pdo_sqlite \
|
||||||
php81-pdo_odbc \
|
php82-pear \
|
||||||
php81-pdo_pgsql \
|
php82-pecl-apcu \
|
||||||
php81-pdo_sqlite \
|
php82-pecl-memcached \
|
||||||
php81-pear \
|
php82-pecl-redis \
|
||||||
php81-pecl-apcu \
|
php82-pgsql \
|
||||||
php81-pecl-mailparse \
|
php82-posix \
|
||||||
php81-pecl-memcached \
|
php82-soap \
|
||||||
php81-pecl-redis \
|
php82-sockets \
|
||||||
php81-pgsql \
|
php82-sodium \
|
||||||
php81-phar \
|
php82-sqlite3 \
|
||||||
php81-posix \
|
php82-tokenizer \
|
||||||
php81-soap \
|
php82-xmlreader \
|
||||||
php81-sockets \
|
php82-xsl \
|
||||||
php81-sodium \
|
|
||||||
php81-sqlite3 \
|
|
||||||
php81-tokenizer \
|
|
||||||
php81-xmlreader \
|
|
||||||
php81-xsl \
|
|
||||||
php81-zip \
|
|
||||||
whois && \
|
whois && \
|
||||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||||
php81-pecl-mcrypt \
|
php82-pecl-mcrypt && \
|
||||||
php81-pecl-xmlrpc && \
|
|
||||||
echo "**** install certbot plugins ****" && \
|
echo "**** install certbot plugins ****" && \
|
||||||
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
||||||
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
|
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
|
||||||
fi && \
|
fi && \
|
||||||
python3 -m ensurepip && \
|
python3 -m venv /lsiopy && \
|
||||||
pip3 install -U --no-cache-dir \
|
pip install -U --no-cache-dir \
|
||||||
pip \
|
pip \
|
||||||
wheel && \
|
wheel && \
|
||||||
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
|
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
|
||||||
certbot==${CERTBOT_VERSION} \
|
certbot==${CERTBOT_VERSION} \
|
||||||
certbot-dns-acmedns \
|
certbot-dns-acmedns \
|
||||||
certbot-dns-aliyun \
|
certbot-dns-aliyun \
|
||||||
certbot-dns-azure \
|
certbot-dns-azure \
|
||||||
|
certbot-dns-bunny \
|
||||||
certbot-dns-cloudflare \
|
certbot-dns-cloudflare \
|
||||||
certbot-dns-cpanel \
|
certbot-dns-cpanel \
|
||||||
certbot-dns-desec \
|
certbot-dns-desec \
|
||||||
@@ -108,8 +102,10 @@ RUN \
|
|||||||
certbot-dns-dnspod \
|
certbot-dns-dnspod \
|
||||||
certbot-dns-do \
|
certbot-dns-do \
|
||||||
certbot-dns-domeneshop \
|
certbot-dns-domeneshop \
|
||||||
|
certbot-dns-dreamhost \
|
||||||
certbot-dns-duckdns \
|
certbot-dns-duckdns \
|
||||||
certbot-dns-dynu \
|
certbot-dns-dynu \
|
||||||
|
certbot-dns-freedns \
|
||||||
certbot-dns-gehirn \
|
certbot-dns-gehirn \
|
||||||
certbot-dns-godaddy \
|
certbot-dns-godaddy \
|
||||||
certbot-dns-google \
|
certbot-dns-google \
|
||||||
|
|||||||
186
Dockerfile.armhf
186
Dockerfile.armhf
@@ -1,186 +0,0 @@
|
|||||||
# syntax=docker/dockerfile:1
|
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
|
|
||||||
|
|
||||||
# set version label
|
|
||||||
ARG BUILD_DATE
|
|
||||||
ARG VERSION
|
|
||||||
ARG CERTBOT_VERSION
|
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
|
||||||
LABEL maintainer="nemchik"
|
|
||||||
|
|
||||||
# environment settings
|
|
||||||
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
|
|
||||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
|
||||||
|
|
||||||
RUN \
|
|
||||||
echo "**** install build packages ****" && \
|
|
||||||
apk add --no-cache --virtual=build-dependencies \
|
|
||||||
build-base \
|
|
||||||
cargo \
|
|
||||||
libffi-dev \
|
|
||||||
libxml2-dev \
|
|
||||||
libxslt-dev \
|
|
||||||
openssl-dev \
|
|
||||||
python3-dev && \
|
|
||||||
echo "**** install runtime packages ****" && \
|
|
||||||
apk add --no-cache --upgrade \
|
|
||||||
fail2ban \
|
|
||||||
gnupg \
|
|
||||||
memcached \
|
|
||||||
nginx-mod-http-brotli \
|
|
||||||
nginx-mod-http-dav-ext \
|
|
||||||
nginx-mod-http-echo \
|
|
||||||
nginx-mod-http-fancyindex \
|
|
||||||
nginx-mod-http-geoip2 \
|
|
||||||
nginx-mod-http-headers-more \
|
|
||||||
nginx-mod-http-image-filter \
|
|
||||||
nginx-mod-http-perl \
|
|
||||||
nginx-mod-http-redis2 \
|
|
||||||
nginx-mod-http-set-misc \
|
|
||||||
nginx-mod-http-upload-progress \
|
|
||||||
nginx-mod-http-xslt-filter \
|
|
||||||
nginx-mod-mail \
|
|
||||||
nginx-mod-rtmp \
|
|
||||||
nginx-mod-stream \
|
|
||||||
nginx-mod-stream-geoip2 \
|
|
||||||
nginx-vim \
|
|
||||||
php81-bcmath \
|
|
||||||
php81-bz2 \
|
|
||||||
php81-ctype \
|
|
||||||
php81-curl \
|
|
||||||
php81-dom \
|
|
||||||
php81-exif \
|
|
||||||
php81-ftp \
|
|
||||||
php81-gd \
|
|
||||||
php81-gmp \
|
|
||||||
php81-iconv \
|
|
||||||
php81-imap \
|
|
||||||
php81-intl \
|
|
||||||
php81-ldap \
|
|
||||||
php81-mysqli \
|
|
||||||
php81-mysqlnd \
|
|
||||||
php81-opcache \
|
|
||||||
php81-pdo_mysql \
|
|
||||||
php81-pdo_odbc \
|
|
||||||
php81-pdo_pgsql \
|
|
||||||
php81-pdo_sqlite \
|
|
||||||
php81-pear \
|
|
||||||
php81-pecl-apcu \
|
|
||||||
php81-pecl-mailparse \
|
|
||||||
php81-pecl-memcached \
|
|
||||||
php81-pecl-redis \
|
|
||||||
php81-pgsql \
|
|
||||||
php81-phar \
|
|
||||||
php81-posix \
|
|
||||||
php81-soap \
|
|
||||||
php81-sockets \
|
|
||||||
php81-sodium \
|
|
||||||
php81-sqlite3 \
|
|
||||||
php81-tokenizer \
|
|
||||||
php81-xmlreader \
|
|
||||||
php81-xsl \
|
|
||||||
php81-zip \
|
|
||||||
whois && \
|
|
||||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
|
||||||
php81-pecl-mcrypt \
|
|
||||||
php81-pecl-xmlrpc && \
|
|
||||||
echo "**** install certbot plugins ****" && \
|
|
||||||
if [ -z ${CERTBOT_VERSION+x} ]; then \
|
|
||||||
CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
|
|
||||||
fi && \
|
|
||||||
python3 -m ensurepip && \
|
|
||||||
pip3 install -U --no-cache-dir \
|
|
||||||
pip \
|
|
||||||
wheel && \
|
|
||||||
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
|
|
||||||
certbot==${CERTBOT_VERSION} \
|
|
||||||
certbot-dns-acmedns \
|
|
||||||
certbot-dns-aliyun \
|
|
||||||
certbot-dns-azure \
|
|
||||||
certbot-dns-cloudflare \
|
|
||||||
certbot-dns-cpanel \
|
|
||||||
certbot-dns-desec \
|
|
||||||
certbot-dns-digitalocean \
|
|
||||||
certbot-dns-directadmin \
|
|
||||||
certbot-dns-dnsimple \
|
|
||||||
certbot-dns-dnsmadeeasy \
|
|
||||||
certbot-dns-dnspod \
|
|
||||||
certbot-dns-do \
|
|
||||||
certbot-dns-domeneshop \
|
|
||||||
certbot-dns-duckdns \
|
|
||||||
certbot-dns-dynu \
|
|
||||||
certbot-dns-gehirn \
|
|
||||||
certbot-dns-godaddy \
|
|
||||||
certbot-dns-google \
|
|
||||||
certbot-dns-google-domains \
|
|
||||||
certbot-dns-he \
|
|
||||||
certbot-dns-hetzner \
|
|
||||||
certbot-dns-infomaniak \
|
|
||||||
certbot-dns-inwx \
|
|
||||||
certbot-dns-ionos \
|
|
||||||
certbot-dns-linode \
|
|
||||||
certbot-dns-loopia \
|
|
||||||
certbot-dns-luadns \
|
|
||||||
certbot-dns-netcup \
|
|
||||||
certbot-dns-njalla \
|
|
||||||
certbot-dns-nsone \
|
|
||||||
certbot-dns-ovh \
|
|
||||||
certbot-dns-porkbun \
|
|
||||||
certbot-dns-rfc2136 \
|
|
||||||
certbot-dns-route53 \
|
|
||||||
certbot-dns-sakuracloud \
|
|
||||||
certbot-dns-standalone \
|
|
||||||
certbot-dns-transip \
|
|
||||||
certbot-dns-vultr \
|
|
||||||
certbot-plugin-gandi \
|
|
||||||
cryptography \
|
|
||||||
future \
|
|
||||||
requests && \
|
|
||||||
echo "**** enable OCSP stapling from base ****" && \
|
|
||||||
sed -i \
|
|
||||||
's|#ssl_stapling on;|ssl_stapling on;|' \
|
|
||||||
/defaults/nginx/ssl.conf.sample && \
|
|
||||||
sed -i \
|
|
||||||
's|#ssl_stapling_verify on;|ssl_stapling_verify on;|' \
|
|
||||||
/defaults/nginx/ssl.conf.sample && \
|
|
||||||
sed -i \
|
|
||||||
's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
|
|
||||||
/defaults/nginx/ssl.conf.sample && \
|
|
||||||
echo "**** correct ip6tables legacy issue ****" && \
|
|
||||||
rm \
|
|
||||||
/sbin/ip6tables && \
|
|
||||||
ln -s \
|
|
||||||
/sbin/ip6tables-nft /sbin/ip6tables && \
|
|
||||||
echo "**** remove unnecessary fail2ban filters ****" && \
|
|
||||||
rm \
|
|
||||||
/etc/fail2ban/jail.d/alpine-ssh.conf && \
|
|
||||||
echo "**** copy fail2ban default action and filter to /defaults ****" && \
|
|
||||||
mkdir -p /defaults/fail2ban && \
|
|
||||||
mv /etc/fail2ban/action.d /defaults/fail2ban/ && \
|
|
||||||
mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \
|
|
||||||
echo "**** define allowipv6 to silence warning ****" && \
|
|
||||||
sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf && \
|
|
||||||
echo "**** copy proxy confs to /defaults ****" && \
|
|
||||||
mkdir -p \
|
|
||||||
/defaults/nginx/proxy-confs && \
|
|
||||||
curl -o \
|
|
||||||
/tmp/proxy-confs.tar.gz -L \
|
|
||||||
"https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \
|
|
||||||
tar xf \
|
|
||||||
/tmp/proxy-confs.tar.gz -C \
|
|
||||||
/defaults/nginx/proxy-confs --strip-components=1 --exclude=linux*/.editorconfig --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \
|
|
||||||
echo "**** cleanup ****" && \
|
|
||||||
apk del --purge \
|
|
||||||
build-dependencies && \
|
|
||||||
rm -rf \
|
|
||||||
/tmp/* \
|
|
||||||
$HOME/.cache \
|
|
||||||
$HOME/.cargo
|
|
||||||
|
|
||||||
# copy local files
|
|
||||||
COPY root/ /
|
|
||||||
|
|
||||||
# ports and volumes
|
|
||||||
EXPOSE 80 443
|
|
||||||
VOLUME /config
|
|
||||||
190
Jenkinsfile
vendored
190
Jenkinsfile
vendored
@@ -40,7 +40,12 @@ pipeline {
|
|||||||
// Setup all the basic environment variables needed for the build
|
// Setup all the basic environment variables needed for the build
|
||||||
stage("Set ENV Variables base"){
|
stage("Set ENV Variables base"){
|
||||||
steps{
|
steps{
|
||||||
sh '''docker pull quay.io/skopeo/stable:v1 || : '''
|
sh '''#! /bin/bash
|
||||||
|
containers=$(docker ps -aq)
|
||||||
|
if [[ -n "${containers}" ]]; then
|
||||||
|
docker stop ${containers}
|
||||||
|
fi
|
||||||
|
docker system prune -af --volumes || : '''
|
||||||
script{
|
script{
|
||||||
env.EXIT_STATUS = ''
|
env.EXIT_STATUS = ''
|
||||||
env.LS_RELEASE = sh(
|
env.LS_RELEASE = sh(
|
||||||
@@ -158,7 +163,7 @@ pipeline {
|
|||||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
|
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
|
||||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
|
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
|
||||||
if (env.MULTIARCH == 'true') {
|
if (env.MULTIARCH == 'true') {
|
||||||
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||||
} else {
|
} else {
|
||||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||||
}
|
}
|
||||||
@@ -181,7 +186,7 @@ pipeline {
|
|||||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
|
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
|
||||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
|
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
|
||||||
if (env.MULTIARCH == 'true') {
|
if (env.MULTIARCH == 'true') {
|
||||||
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||||
} else {
|
} else {
|
||||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||||
}
|
}
|
||||||
@@ -204,12 +209,12 @@ pipeline {
|
|||||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
||||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
|
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
|
||||||
if (env.MULTIARCH == 'true') {
|
if (env.MULTIARCH == 'true') {
|
||||||
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||||
} else {
|
} else {
|
||||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||||
}
|
}
|
||||||
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||||
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||||
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
|
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
|
||||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
|
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
|
||||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
|
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
|
||||||
@@ -275,7 +280,7 @@ pipeline {
|
|||||||
echo "Jenkinsfile is up to date."
|
echo "Jenkinsfile is up to date."
|
||||||
fi
|
fi
|
||||||
# Stage 2 - Delete old templates
|
# Stage 2 - Delete old templates
|
||||||
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
|
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
|
||||||
for i in ${OLD_TEMPLATES}; do
|
for i in ${OLD_TEMPLATES}; do
|
||||||
if [[ -f "${i}" ]]; then
|
if [[ -f "${i}" ]]; then
|
||||||
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
||||||
@@ -311,12 +316,13 @@ pipeline {
|
|||||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
|
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
|
||||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
|
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
|
||||||
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
|
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
|
||||||
|
cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
|
||||||
cd ${TEMPDIR}/repo/${LS_REPO}/
|
cd ${TEMPDIR}/repo/${LS_REPO}/
|
||||||
if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
|
if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
|
||||||
echo ".jenkins-external" >> .gitignore
|
echo ".jenkins-external" >> .gitignore
|
||||||
git add .gitignore
|
git add .gitignore
|
||||||
fi
|
fi
|
||||||
git add ${TEMPLATED_FILES}
|
git add readme-vars.yml ${TEMPLATED_FILES}
|
||||||
git commit -m 'Bot Updating Templated Files'
|
git commit -m 'Bot Updating Templated Files'
|
||||||
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
|
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
|
||||||
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
|
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
|
||||||
@@ -337,6 +343,8 @@ pipeline {
|
|||||||
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
||||||
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
||||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||||
|
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
|
||||||
|
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||||
fi
|
fi
|
||||||
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
|
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
|
||||||
cd ${TEMPDIR}/unraid/templates/
|
cd ${TEMPDIR}/unraid/templates/
|
||||||
@@ -428,8 +436,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
steps{
|
steps{
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
set -e
|
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/swag") | .uuid' || :)
|
||||||
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/swag") | .uuid')
|
|
||||||
if [ -z "${PACKAGE_UUID}" ]; then
|
if [ -z "${PACKAGE_UUID}" ]; then
|
||||||
echo "Adding package to Scarf.sh"
|
echo "Adding package to Scarf.sh"
|
||||||
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
|
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
|
||||||
@@ -509,41 +516,6 @@ pipeline {
|
|||||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage('Build ARMHF') {
|
|
||||||
agent {
|
|
||||||
label 'ARMHF'
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
echo "Running on node: ${NODE_NAME}"
|
|
||||||
echo 'Logging into Github'
|
|
||||||
sh '''#! /bin/bash
|
|
||||||
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
|
|
||||||
'''
|
|
||||||
sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
|
|
||||||
sh "docker buildx build \
|
|
||||||
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
|
||||||
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
|
||||||
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-swag/packages\" \
|
|
||||||
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-swag\" \
|
|
||||||
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-swag\" \
|
|
||||||
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
|
|
||||||
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
|
|
||||||
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
|
|
||||||
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
|
|
||||||
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
|
|
||||||
--label \"org.opencontainers.image.title=Swag\" \
|
|
||||||
--label \"org.opencontainers.image.description=SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.\" \
|
|
||||||
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
|
|
||||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
|
||||||
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
|
||||||
retry(5) {
|
|
||||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
|
||||||
}
|
|
||||||
sh '''docker rmi \
|
|
||||||
${IMAGE}:arm32v7-${META_TAG} \
|
|
||||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('Build ARM64') {
|
stage('Build ARM64') {
|
||||||
agent {
|
agent {
|
||||||
label 'ARM64'
|
label 'ARM64'
|
||||||
@@ -574,9 +546,12 @@ pipeline {
|
|||||||
retry(5) {
|
retry(5) {
|
||||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||||
}
|
}
|
||||||
sh '''docker rmi \
|
sh '''#! /bin/bash
|
||||||
${IMAGE}:arm64v8-${META_TAG} \
|
containers=$(docker ps -aq)
|
||||||
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
if [[ -n "${containers}" ]]; then
|
||||||
|
docker stop ${containers}
|
||||||
|
fi
|
||||||
|
docker system prune -af --volumes || : '''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -637,13 +612,6 @@ pipeline {
|
|||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
sh '''#! /bin/bash
|
|
||||||
echo "Packages were updated. Cleaning up the image and exiting."
|
|
||||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
|
||||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
|
||||||
else
|
|
||||||
docker rmi ${IMAGE}:${META_TAG}
|
|
||||||
fi'''
|
|
||||||
script{
|
script{
|
||||||
env.EXIT_STATUS = 'ABORTED'
|
env.EXIT_STATUS = 'ABORTED'
|
||||||
}
|
}
|
||||||
@@ -661,13 +629,6 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
sh '''#! /bin/bash
|
|
||||||
echo "There are no package updates. Cleaning up the image and exiting."
|
|
||||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
|
||||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
|
||||||
else
|
|
||||||
docker rmi ${IMAGE}:${META_TAG}
|
|
||||||
fi'''
|
|
||||||
script{
|
script{
|
||||||
env.EXIT_STATUS = 'ABORTED'
|
env.EXIT_STATUS = 'ABORTED'
|
||||||
}
|
}
|
||||||
@@ -695,9 +656,7 @@ pipeline {
|
|||||||
set -e
|
set -e
|
||||||
docker pull ghcr.io/linuxserver/ci:latest
|
docker pull ghcr.io/linuxserver/ci:latest
|
||||||
if [ "${MULTIARCH}" == "true" ]; then
|
if [ "${MULTIARCH}" == "true" ]; then
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
|
||||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||||
fi
|
fi
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
@@ -768,17 +727,6 @@ pipeline {
|
|||||||
done
|
done
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
sh '''#! /bin/bash
|
|
||||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
|
||||||
docker rmi \
|
|
||||||
${DELETEIMAGE}:${META_TAG} \
|
|
||||||
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
|
|
||||||
${DELETEIMAGE}:latest || :
|
|
||||||
if [ -n "${SEMVER}" ]; then
|
|
||||||
docker rmi ${DELETEIMAGE}:${SEMVER} || :
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'''
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -811,8 +759,6 @@ pipeline {
|
|||||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||||
if [ "${CI}" == "false" ]; then
|
if [ "${CI}" == "false" ]; then
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
|
||||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||||
fi
|
fi
|
||||||
@@ -820,49 +766,47 @@ pipeline {
|
|||||||
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
|
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
|
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
|
||||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
|
||||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
|
|
||||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
|
||||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
|
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
|
||||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||||
if [ -n "${SEMVER}" ]; then
|
if [ -n "${SEMVER}" ]; then
|
||||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
|
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
|
||||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||||
fi
|
fi
|
||||||
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
|
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:amd64-latest
|
docker push ${MANIFESTIMAGE}:amd64-latest
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-latest
|
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-latest
|
docker push ${MANIFESTIMAGE}:arm64v8-latest
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||||
if [ -n "${SEMVER}" ]; then
|
if [ -n "${SEMVER}" ]; then
|
||||||
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||||
fi
|
fi
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
|
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
|
||||||
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
|
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
|
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
|
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
|
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
|
||||||
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
|
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
|
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
|
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
|
||||||
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
|
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
|
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
|
||||||
if [ -n "${SEMVER}" ]; then
|
if [ -n "${SEMVER}" ]; then
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
|
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
|
||||||
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
|
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
|
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
|
||||||
fi
|
fi
|
||||||
|
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
|
||||||
|
digest=$(curl -s \
|
||||||
|
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
|
||||||
|
--header "Authorization: Bearer ${token}" \
|
||||||
|
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
|
||||||
|
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
|
||||||
|
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
|
||||||
|
docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
|
||||||
|
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
|
||||||
|
fi
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:latest
|
docker manifest push --purge ${MANIFESTIMAGE}:latest
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
|
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
|
||||||
@@ -872,29 +816,6 @@ pipeline {
|
|||||||
done
|
done
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
sh '''#! /bin/bash
|
|
||||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
|
||||||
docker rmi \
|
|
||||||
${DELETEIMAGE}:amd64-${META_TAG} \
|
|
||||||
${DELETEIMAGE}:amd64-latest \
|
|
||||||
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
|
|
||||||
${DELETEIMAGE}:arm32v7-${META_TAG} \
|
|
||||||
${DELETEIMAGE}:arm32v7-latest \
|
|
||||||
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
|
|
||||||
${DELETEIMAGE}:arm64v8-${META_TAG} \
|
|
||||||
${DELETEIMAGE}:arm64v8-latest \
|
|
||||||
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
|
|
||||||
if [ -n "${SEMVER}" ]; then
|
|
||||||
docker rmi \
|
|
||||||
${DELETEIMAGE}:amd64-${SEMVER} \
|
|
||||||
${DELETEIMAGE}:arm32v7-${SEMVER} \
|
|
||||||
${DELETEIMAGE}:arm64v8-${SEMVER} || :
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
docker rmi \
|
|
||||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
|
||||||
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
|
|
||||||
'''
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -965,7 +886,6 @@ pipeline {
|
|||||||
stage('Pull Request Comment') {
|
stage('Pull Request Comment') {
|
||||||
when {
|
when {
|
||||||
not {environment name: 'CHANGE_ID', value: ''}
|
not {environment name: 'CHANGE_ID', value: ''}
|
||||||
environment name: 'CI', value: 'true'
|
|
||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
@@ -1019,16 +939,24 @@ pipeline {
|
|||||||
echo "$escaped_table"
|
echo "$escaped_table"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Retrieve JSON data from URL
|
if [[ "${CI}" = "true" ]]; then
|
||||||
data=$(get_json "$CI_JSON_URL")
|
# Retrieve JSON data from URL
|
||||||
# Create table from JSON data
|
data=$(get_json "$CI_JSON_URL")
|
||||||
table=$(build_table "$data")
|
# Create table from JSON data
|
||||||
echo -e "$table"
|
table=$(build_table "$data")
|
||||||
|
echo -e "$table"
|
||||||
|
|
||||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||||
-H "Accept: application/vnd.github.v3+json" \
|
-H "Accept: application/vnd.github.v3+json" \
|
||||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||||
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"'''
|
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
|
||||||
|
else
|
||||||
|
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||||
|
-H "Accept: application/vnd.github.v3+json" \
|
||||||
|
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||||
|
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
|
||||||
|
fi
|
||||||
|
'''
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1055,6 +983,14 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
cleanup {
|
cleanup {
|
||||||
|
sh '''#! /bin/bash
|
||||||
|
echo "Performing docker system prune!!"
|
||||||
|
containers=$(docker ps -aq)
|
||||||
|
if [[ -n "${containers}" ]]; then
|
||||||
|
docker stop ${containers}
|
||||||
|
fi
|
||||||
|
docker system prune -af --volumes || :
|
||||||
|
'''
|
||||||
cleanWs()
|
cleanWs()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
10
README.md
10
README.md
@@ -56,7 +56,7 @@ The architectures supported by this image are:
|
|||||||
| :----: | :----: | ---- |
|
| :----: | :----: | ---- |
|
||||||
| x86-64 | ✅ | amd64-\<version tag\> |
|
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||||
| arm64 | ✅ | arm64v8-\<version tag\> |
|
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||||
| armhf | ✅ | arm32v7-\<version tag\> |
|
| armhf | ❌ | |
|
||||||
|
|
||||||
## Application Setup
|
## Application Setup
|
||||||
|
|
||||||
@@ -68,7 +68,7 @@ The architectures supported by this image are:
|
|||||||
* For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
|
* For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
|
||||||
* Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
|
* Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
|
||||||
* Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
|
* Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
|
||||||
* DuckDNS only supoprts two types of DNS validated certificates (not both at the same time):
|
* DuckDNS only supports two types of DNS validated certificates (not both at the same time):
|
||||||
1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
|
1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
|
||||||
2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
|
2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
|
||||||
* `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
|
* `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
|
||||||
@@ -215,7 +215,7 @@ Container images are configured using parameters passed at runtime (such as thos
|
|||||||
| `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
|
| `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
|
||||||
| `-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` validation only) |
|
| `-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` validation only) |
|
||||||
| `-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 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 `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `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 `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `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 PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
|
||||||
| `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
|
| `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
|
||||||
| `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` |
|
| `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` |
|
||||||
@@ -336,6 +336,10 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI.
|
||||||
|
* **07.08.23:** - Add Bunny DNS Configuration.
|
||||||
|
* **27.07.23:** - Added support for dreamhost validation.
|
||||||
|
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
|
||||||
* **27.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug.
|
* **27.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug.
|
||||||
* **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik.
|
* **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik.
|
||||||
* **25.03.23:** - Fix renewal post hook.
|
* **25.03.23:** - Fix renewal post hook.
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ external_type: pip_version
|
|||||||
release_type: stable
|
release_type: stable
|
||||||
release_tag: latest
|
release_tag: latest
|
||||||
ls_branch: master
|
ls_branch: master
|
||||||
|
build_armhf: false
|
||||||
repo_vars:
|
repo_vars:
|
||||||
- EXT_PIP = 'certbot'
|
- EXT_PIP = 'certbot'
|
||||||
- BUILD_VERSION_ARG = 'CERTBOT_VERSION'
|
- BUILD_VERSION_ARG = 'CERTBOT_VERSION'
|
||||||
|
|||||||
@@ -1,339 +1,343 @@
|
|||||||
NAME VERSION TYPE
|
NAME VERSION TYPE
|
||||||
ConfigArgParse 1.5.3 python
|
ConfigArgParse 1.7 python
|
||||||
PyJWT 2.7.0 python
|
PyJWT 2.8.0 python
|
||||||
PyYAML 6.0 python
|
PyYAML 6.0.1 python
|
||||||
acme 2.6.0 python
|
Simple Launcher Executable 1.1.0.14 dotnet
|
||||||
alpine-baselayout 3.4.0-r0 apk
|
acme 2.6.0 python
|
||||||
alpine-baselayout-data 3.4.0-r0 apk
|
alpine-baselayout 3.4.3-r1 apk
|
||||||
alpine-keys 2.4-r1 apk
|
alpine-baselayout-data 3.4.3-r1 apk
|
||||||
alpine-release 3.17.3-r0 apk
|
alpine-keys 2.4-r1 apk
|
||||||
aom-libs 3.5.0-r0 apk
|
alpine-release 3.18.2-r0 apk
|
||||||
apache2-utils 2.4.57-r0 apk
|
aom-libs 3.6.1-r0 apk
|
||||||
apk-tools 2.12.10-r1 apk
|
apache2-utils 2.4.57-r3 apk
|
||||||
apr 1.7.2-r0 apk
|
apk-tools 2.14.0-r2 apk
|
||||||
apr-util 1.6.3-r0 apk
|
apr 1.7.4-r0 apk
|
||||||
argon2-libs 20190702-r2 apk
|
apr-util 1.6.3-r1 apk
|
||||||
attrs 23.1.0 python
|
argon2-libs 20190702-r4 apk
|
||||||
azure-common 1.1.28 python
|
attrs 23.1.0 python
|
||||||
azure-core 1.26.4 python
|
azure-common 1.1.28 python
|
||||||
azure-identity 1.12.0 python
|
azure-core 1.29.1 python
|
||||||
azure-mgmt-core 1.4.0 python
|
azure-identity 1.14.0 python
|
||||||
azure-mgmt-dns 8.0.0 python
|
azure-mgmt-core 1.4.0 python
|
||||||
bash 5.2.15-r0 apk
|
azure-mgmt-dns 8.1.0 python
|
||||||
beautifulsoup4 4.12.2 python
|
bash 5.2.15-r5 apk
|
||||||
boto3 1.26.132 python
|
beautifulsoup4 4.12.2 python
|
||||||
botocore 1.29.132 python
|
boto3 1.28.25 python
|
||||||
brotli-libs 1.0.9-r9 apk
|
botocore 1.31.25 python
|
||||||
bs4 0.0.1 python
|
brotli-libs 1.0.9-r14 apk
|
||||||
busybox 1.35.0 binary
|
bs4 0.0.1 python
|
||||||
busybox 1.35.0-r29 apk
|
busybox 1.36.1 binary
|
||||||
busybox-binsh 1.35.0-r29 apk
|
busybox 1.36.1-r2 apk
|
||||||
c-client 2007f-r14 apk
|
busybox-binsh 1.36.1-r2 apk
|
||||||
ca-certificates 20230506-r0 apk
|
c-client 2007f-r15 apk
|
||||||
ca-certificates-bundle 20220614-r4 apk
|
ca-certificates 20230506-r0 apk
|
||||||
cachetools 5.3.0 python
|
ca-certificates-bundle 20230506-r0 apk
|
||||||
certbot 2.6.0 python
|
cachetools 5.3.1 python
|
||||||
certbot-dns-acmedns 0.1.0 python
|
certbot 2.6.0 python
|
||||||
certbot-dns-aliyun 2.0.0 python
|
certbot-dns-acmedns 0.1.0 python
|
||||||
certbot-dns-azure 2.1.0 python
|
certbot-dns-aliyun 2.0.0 python
|
||||||
certbot-dns-cloudflare 2.6.0 python
|
certbot-dns-azure 2.3.0 python
|
||||||
certbot-dns-cpanel 0.4.0 python
|
certbot-dns-bunny 0.0.9 python
|
||||||
certbot-dns-desec 1.2.1 python
|
certbot-dns-cloudflare 2.6.0 python
|
||||||
certbot-dns-digitalocean 2.6.0 python
|
certbot-dns-cpanel 0.4.0 python
|
||||||
certbot-dns-directadmin 1.0.3 python
|
certbot-dns-desec 1.2.1 python
|
||||||
certbot-dns-dnsimple 2.6.0 python
|
certbot-dns-digitalocean 2.6.0 python
|
||||||
certbot-dns-dnsmadeeasy 2.6.0 python
|
certbot-dns-directadmin 1.0.3 python
|
||||||
certbot-dns-dnspod 0.1.0 python
|
certbot-dns-dnsimple 2.6.0 python
|
||||||
certbot-dns-do 0.31.0 python
|
certbot-dns-dnsmadeeasy 2.6.0 python
|
||||||
certbot-dns-domeneshop 0.2.9 python
|
certbot-dns-dnspod 0.1.0 python
|
||||||
certbot-dns-duckdns 1.3 python
|
certbot-dns-do 0.31.0 python
|
||||||
certbot-dns-dynu 0.0.4 python
|
certbot-dns-domeneshop 0.2.9 python
|
||||||
certbot-dns-gehirn 2.6.0 python
|
certbot-dns-dreamhost 1.0 python
|
||||||
certbot-dns-godaddy 0.2.2 python
|
certbot-dns-duckdns 1.3 python
|
||||||
certbot-dns-google 2.6.0 python
|
certbot-dns-dynu 0.0.4 python
|
||||||
certbot-dns-google-domains 0.1.11 python
|
certbot-dns-freedns 0.1.0 python
|
||||||
certbot-dns-he 1.0.0 python
|
certbot-dns-gehirn 2.6.0 python
|
||||||
certbot-dns-hetzner 2.0.0 python
|
certbot-dns-godaddy 2.6.0 python
|
||||||
certbot-dns-infomaniak 0.2.1 python
|
certbot-dns-google 2.6.0 python
|
||||||
certbot-dns-inwx 2.2.0 python
|
certbot-dns-google-domains 0.1.11 python
|
||||||
certbot-dns-ionos 2022.11.24 python
|
certbot-dns-he 1.0.0 python
|
||||||
certbot-dns-linode 2.6.0 python
|
certbot-dns-hetzner 2.0.0 python
|
||||||
certbot-dns-loopia 1.0.1 python
|
certbot-dns-infomaniak 0.2.1 python
|
||||||
certbot-dns-luadns 2.6.0 python
|
certbot-dns-inwx 2.2.0 python
|
||||||
certbot-dns-netcup 1.2.0 python
|
certbot-dns-ionos 2022.11.24 python
|
||||||
certbot-dns-njalla 1.0.0 python
|
certbot-dns-linode 2.6.0 python
|
||||||
certbot-dns-nsone 2.6.0 python
|
certbot-dns-loopia 1.0.1 python
|
||||||
certbot-dns-ovh 2.6.0 python
|
certbot-dns-luadns 2.6.0 python
|
||||||
certbot-dns-porkbun 0.8 python
|
certbot-dns-netcup 1.3.0 python
|
||||||
certbot-dns-rfc2136 2.6.0 python
|
certbot-dns-njalla 1.0.0 python
|
||||||
certbot-dns-route53 2.6.0 python
|
certbot-dns-nsone 2.6.0 python
|
||||||
certbot-dns-sakuracloud 2.6.0 python
|
certbot-dns-ovh 2.6.0 python
|
||||||
certbot-dns-standalone 1.1 python
|
certbot-dns-porkbun 0.8 python
|
||||||
certbot-dns-transip 0.5.2 python
|
certbot-dns-rfc2136 2.6.0 python
|
||||||
certbot-dns-vultr 1.0.3 python
|
certbot-dns-route53 2.6.0 python
|
||||||
certbot-plugin-gandi 1.4.3 python
|
certbot-dns-sakuracloud 2.6.0 python
|
||||||
certifi 2023.5.7 python
|
certbot-dns-standalone 1.1 python
|
||||||
cffi 1.15.1 python
|
certbot-dns-transip 0.5.2 python
|
||||||
charset-normalizer 3.1.0 python
|
certbot-dns-vultr 1.1.0 python
|
||||||
cloudflare 2.11.1 python
|
certbot-plugin-gandi 1.4.3 python
|
||||||
configobj 5.0.8 python
|
certifi 2023.7.22 python
|
||||||
coreutils 9.1-r0 apk
|
cffi 1.15.1 python
|
||||||
cryptography 40.0.2 python
|
charset-normalizer 3.2.0 python
|
||||||
curl 8.0.1-r0 apk
|
cloudflare 2.11.6 python
|
||||||
dataclasses-json 0.5.7 python
|
configobj 5.0.8 python
|
||||||
distro 1.8.0 python
|
coreutils 9.3-r1 apk
|
||||||
dns-lexicon 3.11.7 python
|
cryptography 41.0.3 python
|
||||||
dnslib 0.9.23 python
|
curl 8.2.1-r0 apk
|
||||||
dnspython 2.3.0 python
|
dataclasses-json 0.5.14 python
|
||||||
domeneshop 0.4.3 python
|
distro 1.8.0 python
|
||||||
fail2ban 1.0.2 python
|
dns-lexicon 3.11.7 python
|
||||||
fail2ban 1.0.2-r0 apk
|
dnslib 0.9.23 python
|
||||||
filelock 3.12.0 python
|
dnspython 2.4.2 python
|
||||||
fontconfig 2.14.1-r0 apk
|
domeneshop 0.4.3 python
|
||||||
freetype 2.12.1-r0 apk
|
fail2ban 1.0.2 python
|
||||||
future 0.18.3 python
|
fail2ban 1.0.2-r2 apk
|
||||||
gdbm 1.23-r0 apk
|
fail2ban-pyc 1.0.2-r2 apk
|
||||||
git 2.38.5-r0 apk
|
filelock 3.12.2 python
|
||||||
git-perl 2.38.5-r0 apk
|
fontconfig 2.14.2-r3 apk
|
||||||
gmp 6.2.1-r2 apk
|
freetype 2.13.0-r5 apk
|
||||||
gnupg 2.2.40-r0 apk
|
future 0.18.3 python
|
||||||
gnupg-dirmngr 2.2.40-r0 apk
|
gdbm 1.23-r1 apk
|
||||||
gnupg-gpgconf 2.2.40-r0 apk
|
git 2.40.1-r0 apk
|
||||||
gnupg-utils 2.2.40-r0 apk
|
git-perl 2.40.1-r0 apk
|
||||||
gnupg-wks-client 2.2.40-r0 apk
|
gmp 6.2.1-r3 apk
|
||||||
gnutls 3.7.8-r3 apk
|
gnupg 2.4.3-r0 apk
|
||||||
google-api-core 2.11.0 python
|
gnupg-dirmngr 2.4.3-r0 apk
|
||||||
google-api-python-client 2.86.0 python
|
gnupg-gpgconf 2.4.3-r0 apk
|
||||||
google-auth 2.18.0 python
|
gnupg-keyboxd 2.4.3-r0 apk
|
||||||
google-auth-httplib2 0.1.0 python
|
gnupg-utils 2.4.3-r0 apk
|
||||||
googleapis-common-protos 1.59.0 python
|
gnupg-wks-client 2.4.3-r0 apk
|
||||||
gpg 2.2.40-r0 apk
|
gnutls 3.8.0-r2 apk
|
||||||
gpg-agent 2.2.40-r0 apk
|
google-api-core 2.11.1 python
|
||||||
gpg-wks-server 2.2.40-r0 apk
|
google-api-python-client 2.96.0 python
|
||||||
gpgsm 2.2.40-r0 apk
|
google-auth 2.22.0 python
|
||||||
gpgv 2.2.40-r0 apk
|
google-auth-httplib2 0.1.0 python
|
||||||
httplib2 0.22.0 python
|
googleapis-common-protos 1.60.0 python
|
||||||
icu-data-en 72.1-r1 apk
|
gpg 2.4.3-r0 apk
|
||||||
icu-libs 72.1-r1 apk
|
gpg-agent 2.4.3-r0 apk
|
||||||
idna 3.4 python
|
gpg-wks-server 2.4.3-r0 apk
|
||||||
importlib-metadata 6.6.0 python
|
gpgsm 2.4.3-r0 apk
|
||||||
ip6tables 1.8.8-r2 apk
|
gpgv 2.4.3-r0 apk
|
||||||
iptables 1.8.8-r2 apk
|
httplib2 0.22.0 python
|
||||||
isodate 0.6.1 python
|
icu-data-en 73.2-r2 apk
|
||||||
jmespath 1.0.1 python
|
icu-libs 73.2-r2 apk
|
||||||
josepy 1.13.0 python
|
idna 3.4 python
|
||||||
jq 1.6-r2 apk
|
importlib-metadata 6.8.0 python
|
||||||
jsonlines 3.1.0 python
|
ip6tables 1.8.9-r2 apk
|
||||||
jsonpickle 3.0.1 python
|
iptables 1.8.9-r2 apk
|
||||||
libacl 2.3.1-r1 apk
|
isodate 0.6.1 python
|
||||||
libassuan 2.5.5-r1 apk
|
jmespath 1.0.1 python
|
||||||
libattr 2.5.1-r2 apk
|
josepy 1.13.0 python
|
||||||
libavif 0.11.1-r0 apk
|
jq 1.6-r3 apk
|
||||||
libbsd 0.11.7-r0 apk
|
jsonlines 3.1.0 python
|
||||||
libbz2 1.0.8-r4 apk
|
jsonpickle 3.0.1 python
|
||||||
libc-utils 0.7.2-r3 apk
|
libacl 2.3.1-r3 apk
|
||||||
libcrypto3 3.0.8-r4 apk
|
libassuan 2.5.6-r0 apk
|
||||||
libcurl 8.0.1-r0 apk
|
libattr 2.5.1-r4 apk
|
||||||
libdav1d 1.0.0-r2 apk
|
libavif 0.11.1-r2 apk
|
||||||
libedit 20221030.3.1-r0 apk
|
libbsd 0.11.7-r1 apk
|
||||||
libevent 2.1.12-r5 apk
|
libbz2 1.0.8-r5 apk
|
||||||
libexpat 2.5.0-r0 apk
|
libc-utils 0.7.2-r5 apk
|
||||||
libffi 3.4.4-r0 apk
|
libcrypto3 3.1.2-r0 apk
|
||||||
libgcc 12.2.1_git20220924-r4 apk
|
libcurl 8.2.1-r0 apk
|
||||||
libgcrypt 1.10.1-r0 apk
|
libdav1d 1.2.1-r0 apk
|
||||||
libgd 2.3.3-r3 apk
|
libedit 20221030.3.1-r1 apk
|
||||||
libgpg-error 1.46-r1 apk
|
libevent 2.1.12-r6 apk
|
||||||
libice 1.0.10-r1 apk
|
libexpat 2.5.0-r1 apk
|
||||||
libidn 1.41-r0 apk
|
libffi 3.4.4-r2 apk
|
||||||
libintl 0.21.1-r1 apk
|
libgcc 12.2.1_git20220924-r10 apk
|
||||||
libjpeg-turbo 2.1.4-r0 apk
|
libgcrypt 1.10.2-r1 apk
|
||||||
libksba 1.6.3-r0 apk
|
libgd 2.3.3-r7 apk
|
||||||
libldap 2.6.3-r6 apk
|
libgpg-error 1.47-r1 apk
|
||||||
libmaxminddb-libs 1.7.1-r0 apk
|
libice 1.1.1-r2 apk
|
||||||
libmcrypt 2.5.8-r10 apk
|
libidn2 2.3.4-r1 apk
|
||||||
libmd 1.0.4-r0 apk
|
libintl 0.21.1-r7 apk
|
||||||
libmemcached-libs 1.0.18-r5 apk
|
libjpeg-turbo 2.1.5.1-r3 apk
|
||||||
libmnl 1.0.5-r0 apk
|
libksba 1.6.4-r0 apk
|
||||||
libnftnl 1.2.4-r0 apk
|
libldap 2.6.5-r0 apk
|
||||||
libpng 1.6.38-r0 apk
|
libmaxminddb-libs 1.7.1-r1 apk
|
||||||
libpq 15.2-r0 apk
|
libmcrypt 2.5.8-r10 apk
|
||||||
libproc 3.3.17-r2 apk
|
libmd 1.0.4-r2 apk
|
||||||
libsasl 2.1.28-r3 apk
|
libmemcached-libs 1.1.4-r1 apk
|
||||||
libseccomp 2.5.4-r0 apk
|
libmnl 1.0.5-r1 apk
|
||||||
libsm 1.2.3-r1 apk
|
libncursesw 6.4_p20230506-r0 apk
|
||||||
libsodium 1.0.18-r2 apk
|
libnftnl 1.2.5-r1 apk
|
||||||
libssl3 3.0.8-r4 apk
|
libpanelw 6.4_p20230506-r0 apk
|
||||||
libstdc++ 12.2.1_git20220924-r4 apk
|
libpng 1.6.39-r3 apk
|
||||||
libtasn1 4.19.0-r0 apk
|
libpq 15.3-r0 apk
|
||||||
libunistring 1.1-r0 apk
|
libproc2 4.0.3-r1 apk
|
||||||
libuuid 2.38.1-r1 apk
|
libsasl 2.1.28-r4 apk
|
||||||
libwebp 1.2.4-r1 apk
|
libseccomp 2.5.4-r2 apk
|
||||||
libx11 1.8.4-r0 apk
|
libsm 1.2.4-r1 apk
|
||||||
libxau 1.0.10-r0 apk
|
libsodium 1.0.18-r3 apk
|
||||||
libxcb 1.15-r0 apk
|
libssl3 3.1.2-r0 apk
|
||||||
libxdmcp 1.1.4-r0 apk
|
libstdc++ 12.2.1_git20220924-r10 apk
|
||||||
libxext 1.3.5-r0 apk
|
libtasn1 4.19.0-r1 apk
|
||||||
libxml2 2.10.4-r0 apk
|
libunistring 1.1-r1 apk
|
||||||
libxpm 3.5.15-r0 apk
|
libuuid 2.38.1-r8 apk
|
||||||
libxslt 1.1.37-r1 apk
|
libwebp 1.3.1-r0 apk
|
||||||
libxt 1.2.1-r0 apk
|
libx11 1.8.4-r4 apk
|
||||||
libzip 1.9.2-r2 apk
|
libxau 1.0.11-r2 apk
|
||||||
linux-pam 1.5.2-r1 apk
|
libxcb 1.15-r1 apk
|
||||||
logrotate 3.20.1-r3 apk
|
libxdmcp 1.1.4-r2 apk
|
||||||
loopialib 0.2.0 python
|
libxext 1.3.5-r2 apk
|
||||||
lxml 4.9.2 python
|
libxml2 2.11.4-r0 apk
|
||||||
lz4-libs 1.9.4-r1 apk
|
libxpm 3.5.16-r1 apk
|
||||||
marshmallow 3.19.0 python
|
libxslt 1.1.38-r0 apk
|
||||||
marshmallow-enum 1.5.1 python
|
libxt 1.3.0-r2 apk
|
||||||
memcached 1.6.17 binary
|
libzip 1.9.2-r2 apk
|
||||||
memcached 1.6.17-r0 apk
|
linux-pam 1.5.2-r10 apk
|
||||||
mock 5.0.2 python
|
logrotate 3.21.0-r1 apk
|
||||||
mpdecimal 2.5.1-r1 apk
|
loopialib 0.2.0 python
|
||||||
msal 1.22.0 python
|
lxml 4.9.3 python
|
||||||
msal-extensions 1.0.0 python
|
lz4-libs 1.9.4-r4 apk
|
||||||
msrest 0.7.1 python
|
marshmallow 3.20.1 python
|
||||||
musl 1.2.3-r4 apk
|
memcached 1.6.21 binary
|
||||||
musl-utils 1.2.3-r4 apk
|
memcached 1.6.21-r0 apk
|
||||||
mypy-extensions 1.0.0 python
|
mock 5.1.0 python
|
||||||
nano 7.0-r0 apk
|
mpdecimal 2.5.1-r2 apk
|
||||||
ncurses-libs 6.3_p20221119-r0 apk
|
msal 1.23.0 python
|
||||||
ncurses-terminfo-base 6.3_p20221119-r0 apk
|
msal-extensions 1.0.0 python
|
||||||
netcat-openbsd 1.130-r4 apk
|
musl 1.2.4-r1 apk
|
||||||
nettle 3.8.1-r0 apk
|
musl-utils 1.2.4-r1 apk
|
||||||
nghttp2-libs 1.51.0-r0 apk
|
mypy-extensions 1.0.0 python
|
||||||
nginx 1.22.1-r0 apk
|
nano 7.2-r1 apk
|
||||||
nginx-mod-devel-kit 1.22.1-r0 apk
|
ncurses-terminfo-base 6.4_p20230506-r0 apk
|
||||||
nginx-mod-http-brotli 1.22.1-r0 apk
|
netcat-openbsd 1.219-r1 apk
|
||||||
nginx-mod-http-dav-ext 1.22.1-r0 apk
|
nettle 3.8.1-r2 apk
|
||||||
nginx-mod-http-echo 1.22.1-r0 apk
|
nghttp2-libs 1.55.1-r0 apk
|
||||||
nginx-mod-http-fancyindex 1.22.1-r0 apk
|
nginx 1.24.0-r6 apk
|
||||||
nginx-mod-http-geoip2 1.22.1-r0 apk
|
nginx-mod-devel-kit 1.24.0-r6 apk
|
||||||
nginx-mod-http-headers-more 1.22.1-r0 apk
|
nginx-mod-http-brotli 1.24.0-r6 apk
|
||||||
nginx-mod-http-image-filter 1.22.1-r0 apk
|
nginx-mod-http-dav-ext 1.24.0-r6 apk
|
||||||
nginx-mod-http-perl 1.22.1-r0 apk
|
nginx-mod-http-echo 1.24.0-r6 apk
|
||||||
nginx-mod-http-redis2 1.22.1-r0 apk
|
nginx-mod-http-fancyindex 1.24.0-r6 apk
|
||||||
nginx-mod-http-set-misc 1.22.1-r0 apk
|
nginx-mod-http-geoip2 1.24.0-r6 apk
|
||||||
nginx-mod-http-upload-progress 1.22.1-r0 apk
|
nginx-mod-http-headers-more 1.24.0-r6 apk
|
||||||
nginx-mod-http-xslt-filter 1.22.1-r0 apk
|
nginx-mod-http-image-filter 1.24.0-r6 apk
|
||||||
nginx-mod-mail 1.22.1-r0 apk
|
nginx-mod-http-perl 1.24.0-r6 apk
|
||||||
nginx-mod-rtmp 1.22.1-r0 apk
|
nginx-mod-http-redis2 1.24.0-r6 apk
|
||||||
nginx-mod-stream 1.22.1-r0 apk
|
nginx-mod-http-set-misc 1.24.0-r6 apk
|
||||||
nginx-mod-stream-geoip2 1.22.1-r0 apk
|
nginx-mod-http-upload-progress 1.24.0-r6 apk
|
||||||
nginx-vim 1.22.1-r0 apk
|
nginx-mod-http-xslt-filter 1.24.0-r6 apk
|
||||||
npth 1.6-r2 apk
|
nginx-mod-mail 1.24.0-r6 apk
|
||||||
oauthlib 3.2.2 python
|
nginx-mod-rtmp 1.24.0-r6 apk
|
||||||
oniguruma 6.9.8-r0 apk
|
nginx-mod-stream 1.24.0-r6 apk
|
||||||
openssl 3.0.8-r4 apk
|
nginx-mod-stream-geoip2 1.24.0-r6 apk
|
||||||
p11-kit 0.24.1-r1 apk
|
nginx-vim 1.24.0-r6 apk
|
||||||
packaging 23.1 python
|
npth 1.6-r4 apk
|
||||||
parsedatetime 2.6 python
|
oniguruma 6.9.8-r1 apk
|
||||||
pcre 8.45-r2 apk
|
openssl 3.1.2-r0 apk
|
||||||
pcre2 10.42-r0 apk
|
p11-kit 0.24.1-r2 apk
|
||||||
perl 5.36.0-r1 apk
|
packaging 23.1 python
|
||||||
perl-error 0.17029-r1 apk
|
parsedatetime 2.6 python
|
||||||
perl-git 2.38.5-r0 apk
|
pcre 8.45-r3 apk
|
||||||
php-cli 8.1.18 binary
|
pcre2 10.42-r1 apk
|
||||||
php-fpm 8.1.18 binary
|
perl 5.36.1-r2 apk
|
||||||
php81 8.1.18-r0 apk
|
perl-error 0.17029-r1 apk
|
||||||
php81-bcmath 8.1.18-r0 apk
|
perl-git 2.40.1-r0 apk
|
||||||
php81-bz2 8.1.18-r0 apk
|
php-cli 8.2.8 binary
|
||||||
php81-common 8.1.18-r0 apk
|
php-fpm 8.2.8 binary
|
||||||
php81-ctype 8.1.18-r0 apk
|
php82 8.2.8-r0 apk
|
||||||
php81-curl 8.1.18-r0 apk
|
php82-bcmath 8.2.8-r0 apk
|
||||||
php81-dom 8.1.18-r0 apk
|
php82-bz2 8.2.8-r0 apk
|
||||||
php81-exif 8.1.18-r0 apk
|
php82-common 8.2.8-r0 apk
|
||||||
php81-fileinfo 8.1.18-r0 apk
|
php82-ctype 8.2.8-r0 apk
|
||||||
php81-fpm 8.1.18-r0 apk
|
php82-curl 8.2.8-r0 apk
|
||||||
php81-ftp 8.1.18-r0 apk
|
php82-dom 8.2.8-r0 apk
|
||||||
php81-gd 8.1.18-r0 apk
|
php82-exif 8.2.8-r0 apk
|
||||||
php81-gmp 8.1.18-r0 apk
|
php82-fileinfo 8.2.8-r0 apk
|
||||||
php81-iconv 8.1.18-r0 apk
|
php82-fpm 8.2.8-r0 apk
|
||||||
php81-imap 8.1.18-r0 apk
|
php82-ftp 8.2.8-r0 apk
|
||||||
php81-intl 8.1.18-r0 apk
|
php82-gd 8.2.8-r0 apk
|
||||||
php81-ldap 8.1.18-r0 apk
|
php82-gmp 8.2.8-r0 apk
|
||||||
php81-mbstring 8.1.18-r0 apk
|
php82-iconv 8.2.8-r0 apk
|
||||||
php81-mysqli 8.1.18-r0 apk
|
php82-imap 8.2.8-r0 apk
|
||||||
php81-mysqlnd 8.1.18-r0 apk
|
php82-intl 8.2.8-r0 apk
|
||||||
php81-opcache 8.1.18-r0 apk
|
php82-ldap 8.2.8-r0 apk
|
||||||
php81-openssl 8.1.18-r0 apk
|
php82-mbstring 8.2.8-r0 apk
|
||||||
php81-pdo 8.1.18-r0 apk
|
php82-mysqli 8.2.8-r0 apk
|
||||||
php81-pdo_mysql 8.1.18-r0 apk
|
php82-mysqlnd 8.2.8-r0 apk
|
||||||
php81-pdo_odbc 8.1.18-r0 apk
|
php82-opcache 8.2.8-r0 apk
|
||||||
php81-pdo_pgsql 8.1.18-r0 apk
|
php82-openssl 8.2.8-r0 apk
|
||||||
php81-pdo_sqlite 8.1.18-r0 apk
|
php82-pdo 8.2.8-r0 apk
|
||||||
php81-pear 8.1.18-r0 apk
|
php82-pdo_mysql 8.2.8-r0 apk
|
||||||
php81-pecl-apcu 5.1.22-r0 apk
|
php82-pdo_odbc 8.2.8-r0 apk
|
||||||
php81-pecl-igbinary 3.2.12-r0 apk
|
php82-pdo_pgsql 8.2.8-r0 apk
|
||||||
php81-pecl-mailparse 3.1.4-r0 apk
|
php82-pdo_sqlite 8.2.8-r0 apk
|
||||||
php81-pecl-mcrypt 1.0.6-r0 apk
|
php82-pear 8.2.8-r0 apk
|
||||||
php81-pecl-memcached 3.2.0-r0 apk
|
php82-pecl-apcu 5.1.22-r0 apk
|
||||||
php81-pecl-redis 5.3.7-r0 apk
|
php82-pecl-igbinary 3.2.14-r0 apk
|
||||||
php81-pecl-xmlrpc 1.0.0_rc3-r1 apk
|
php82-pecl-mcrypt 1.0.6-r0 apk
|
||||||
php81-pgsql 8.1.18-r0 apk
|
php82-pecl-memcached 3.2.0-r1 apk
|
||||||
php81-phar 8.1.18-r0 apk
|
php82-pecl-msgpack 2.2.0-r0 apk
|
||||||
php81-posix 8.1.18-r0 apk
|
php82-pecl-redis 5.3.7-r2 apk
|
||||||
php81-session 8.1.18-r0 apk
|
php82-pgsql 8.2.8-r0 apk
|
||||||
php81-simplexml 8.1.18-r0 apk
|
php82-phar 8.2.8-r0 apk
|
||||||
php81-soap 8.1.18-r0 apk
|
php82-posix 8.2.8-r0 apk
|
||||||
php81-sockets 8.1.18-r0 apk
|
php82-session 8.2.8-r0 apk
|
||||||
php81-sodium 8.1.18-r0 apk
|
php82-simplexml 8.2.8-r0 apk
|
||||||
php81-sqlite3 8.1.18-r0 apk
|
php82-soap 8.2.8-r0 apk
|
||||||
php81-tokenizer 8.1.18-r0 apk
|
php82-sockets 8.2.8-r0 apk
|
||||||
php81-xml 8.1.18-r0 apk
|
php82-sodium 8.2.8-r0 apk
|
||||||
php81-xmlreader 8.1.18-r0 apk
|
php82-sqlite3 8.2.8-r0 apk
|
||||||
php81-xmlwriter 8.1.18-r0 apk
|
php82-tokenizer 8.2.8-r0 apk
|
||||||
php81-xsl 8.1.18-r0 apk
|
php82-xml 8.2.8-r0 apk
|
||||||
php81-zip 8.1.18-r0 apk
|
php82-xmlreader 8.2.8-r0 apk
|
||||||
pinentry 1.2.1-r0 apk
|
php82-xmlwriter 8.2.8-r0 apk
|
||||||
pip 23.1.2 python
|
php82-xsl 8.2.8-r0 apk
|
||||||
pkb-client 1.2 python
|
php82-zip 8.2.8-r0 apk
|
||||||
popt 1.19-r0 apk
|
pinentry 1.2.1-r1 apk
|
||||||
portalocker 2.7.0 python
|
pip 23.2.1 python
|
||||||
procps 3.3.17-r2 apk
|
pkb-client 1.2 python
|
||||||
protobuf 4.23.0 python
|
popt 1.19-r2 apk
|
||||||
publicsuffixlist 0.9.4 python
|
portalocker 2.7.0 python
|
||||||
pyOpenSSL 23.1.1 python
|
procps-ng 4.0.3-r1 apk
|
||||||
pyRFC3339 1.1 python
|
protobuf 4.24.0 python
|
||||||
pyacmedns 0.4 python
|
publicsuffixlist 0.9.4 python
|
||||||
pyasn1 0.5.0 python
|
pyOpenSSL 23.2.0 python
|
||||||
pyasn1-modules 0.3.0 python
|
pyRFC3339 1.1 python
|
||||||
pycparser 2.21 python
|
pyacmedns 0.4 python
|
||||||
pyparsing 3.0.9 python
|
pyasn1 0.5.0 python
|
||||||
python 3.10.11 binary
|
pyasn1-modules 0.3.0 python
|
||||||
python-dateutil 2.8.2 python
|
pyc 0.1-r0 apk
|
||||||
python-digitalocean 1.17.0 python
|
pycparser 2.21 python
|
||||||
python-transip 0.6.0 python
|
pyparsing 3.1.1 python
|
||||||
python3 3.10.11-r0 apk
|
python 3.11.4 binary
|
||||||
pytz 2023.3 python
|
python-dateutil 2.8.2 python
|
||||||
readline 8.2.0-r0 apk
|
python-digitalocean 1.17.0 python
|
||||||
requests 2.30.0 python
|
python-transip 0.6.0 python
|
||||||
requests-file 1.5.1 python
|
python3 3.11.4-r0 apk
|
||||||
requests-mock 1.10.0 python
|
python3-pyc 3.11.4-r0 apk
|
||||||
requests-oauthlib 1.3.1 python
|
python3-pycache-pyc0 3.11.4-r0 apk
|
||||||
rsa 4.9 python
|
pytz 2023.3 python
|
||||||
s3transfer 0.6.1 python
|
readline 8.2.1-r1 apk
|
||||||
scanelf 1.3.5-r1 apk
|
requests 2.31.0 python
|
||||||
setuptools 65.5.0 python
|
requests-file 1.5.1 python
|
||||||
shadow 4.13-r0 apk
|
requests-mock 1.11.0 python
|
||||||
six 1.16.0 python
|
rsa 4.9 python
|
||||||
skalibs 2.12.0.1-r0 apk
|
s3transfer 0.6.1 python
|
||||||
soupsieve 2.4.1 python
|
scanelf 1.3.7-r1 apk
|
||||||
sqlite-libs 3.40.1-r0 apk
|
setuptools 65.5.0 python
|
||||||
ssl_client 1.35.0-r29 apk
|
shadow 4.13-r4 apk
|
||||||
tiff 4.4.0-r3 apk
|
six 1.16.0 python
|
||||||
tldextract 3.4.1 python
|
skalibs 2.13.1.1-r1 apk
|
||||||
typing-inspect 0.8.0 python
|
soupsieve 2.4.1 python
|
||||||
typing_extensions 4.5.0 python
|
sqlite-libs 3.41.2-r2 apk
|
||||||
tzdata 2023c-r0 apk
|
ssl_client 1.36.1-r2 apk
|
||||||
unixodbc 2.3.11-r0 apk
|
tiff 4.5.1-r0 apk
|
||||||
uritemplate 4.1.1 python
|
tldextract 3.4.4 python
|
||||||
urllib3 1.26.15 python
|
typing-inspect 0.9.0 python
|
||||||
utmps-libs 0.1.2.0-r1 apk
|
typing_extensions 4.7.1 python
|
||||||
wheel 0.40.0 python
|
tzdata 2023c-r1 apk
|
||||||
whois 5.5.14-r0 apk
|
unixodbc 2.3.11-r2 apk
|
||||||
xz 5.2.9-r0 apk
|
uritemplate 4.1.1 python
|
||||||
xz-libs 5.2.9-r0 apk
|
urllib3 1.26.16 python
|
||||||
zipp 3.15.0 python
|
utmps-libs 0.1.2.1-r1 apk
|
||||||
zlib 1.2.13-r0 apk
|
wheel 0.41.1 python
|
||||||
zope.interface 6.0 python
|
whois 5.5.17-r0 apk
|
||||||
zstd-libs 1.5.5-r0 apk
|
xz-libs 5.4.3-r0 apk
|
||||||
|
zipp 3.16.2 python
|
||||||
|
zlib 1.2.13-r1 apk
|
||||||
|
zope.interface 6.0 python
|
||||||
|
zstd-libs 1.5.5-r4 apk
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ project_blurb_optional_extras: []
|
|||||||
available_architectures:
|
available_architectures:
|
||||||
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
||||||
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
||||||
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
|
|
||||||
|
|
||||||
# development version
|
# development version
|
||||||
development_versions: false
|
development_versions: false
|
||||||
@@ -51,7 +50,7 @@ opt_param_usage_include_env: true
|
|||||||
opt_param_env_vars:
|
opt_param_env_vars:
|
||||||
- { env_var: "SUBDOMAINS", env_value: "www,", desc: "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` validation only)" }
|
- { env_var: "SUBDOMAINS", env_value: "www,", desc: "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` validation only)" }
|
||||||
- { 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: "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 `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `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 `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `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: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
|
||||||
- { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
|
- { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
|
||||||
- { env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`" }
|
- { env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`" }
|
||||||
@@ -84,7 +83,7 @@ app_setup_block: |
|
|||||||
* For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
|
* For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
|
||||||
* Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
|
* Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
|
||||||
* Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
|
* Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
|
||||||
* DuckDNS only supoprts two types of DNS validated certificates (not both at the same time):
|
* DuckDNS only supports two types of DNS validated certificates (not both at the same time):
|
||||||
1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
|
1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
|
||||||
2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
|
2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
|
||||||
* `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
|
* `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
|
||||||
@@ -154,6 +153,10 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." }
|
||||||
|
- { date: "07.08.23:", desc: "Add Bunny DNS Configuration." }
|
||||||
|
- { date: "27.07.23:", desc: "Added support for dreamhost validation." }
|
||||||
|
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
|
||||||
- { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug." }
|
- { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug." }
|
||||||
- { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik." }
|
- { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik." }
|
||||||
- { date: "25.03.23:", desc: "Fix renewal post hook." }
|
- { date: "25.03.23:", desc: "Fix renewal post hook." }
|
||||||
|
|||||||
2
root/defaults/dns-conf/bunny.ini
Normal file
2
root/defaults/dns-conf/bunny.ini
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# Bunny API token used by Certbot
|
||||||
|
dns_bunny_api_key = a65e8ebd-45ab-44d2-a542-40d4d009e3bf
|
||||||
4
root/defaults/dns-conf/dreamhost.ini
Normal file
4
root/defaults/dns-conf/dreamhost.ini
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Instructions: https://github.com/goncalo-leal/certbot-dns-dreamhost#usage
|
||||||
|
# Replace with your values
|
||||||
|
dns_dreamhost_baseurl = "https://api.dreamhost.com/"
|
||||||
|
dns_dreamhost_api_key = "<api_key>"
|
||||||
4
root/defaults/dns-conf/freedns.ini
Normal file
4
root/defaults/dns-conf/freedns.ini
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Instructions: https://github.com/schleuss/certbot_dns_freedns#credentials
|
||||||
|
# Replace with your values
|
||||||
|
dns_freedns_username = myremoteuser
|
||||||
|
dns_freedns_password = verysecureremoteuserpassword
|
||||||
@@ -3,5 +3,3 @@
|
|||||||
[Definition]
|
[Definition]
|
||||||
|
|
||||||
failregex = ^<HOST>.*"(GET|POST|HEAD).*" (401) .*$
|
failregex = ^<HOST>.*"(GET|POST|HEAD).*" (401) .*$
|
||||||
|
|
||||||
ignoreregex = .*(?i)plex.*
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
## Version 2023/06/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||||
|
|
||||||
# redirect all traffic to https
|
# redirect all traffic to https
|
||||||
server {
|
server {
|
||||||
@@ -52,6 +52,19 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^(.+\.php)(.*)$ {
|
location ~ ^(.+\.php)(.*)$ {
|
||||||
|
# enable the next two lines for http auth
|
||||||
|
#auth_basic "Restricted";
|
||||||
|
#auth_basic_user_file /config/nginx/.htpasswd;
|
||||||
|
|
||||||
|
# enable for ldap auth (requires ldap-server.conf in the server block)
|
||||||
|
#include /config/nginx/ldap-location.conf;
|
||||||
|
|
||||||
|
# enable for Authelia (requires authelia-server.conf in the server block)
|
||||||
|
#include /config/nginx/authelia-location.conf;
|
||||||
|
|
||||||
|
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||||
|
#include /config/nginx/authentik-location.conf;
|
||||||
|
|
||||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||||
fastcgi_pass 127.0.0.1:9000;
|
fastcgi_pass 127.0.0.1:9000;
|
||||||
fastcgi_index index.php;
|
fastcgi_index index.php;
|
||||||
|
|||||||
@@ -24,18 +24,37 @@ for i in "${SANED_VARS[@]}"; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
# check to make sure DNSPLUGIN is selected if dns validation is used
|
# 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|google-domains|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then
|
CERTBOT_DNS_AUTHENTICATORS=$(certbot plugins --authenticators 2>/dev/null | sed -e 's/^Entry point: cpanel =/Entry point: dns-cpanel =/' -e '/^Entry point: dns-/!d' -e 's/^Entry point: dns-\([^ ]*\) =.*/\1/' | sort)
|
||||||
echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details."
|
if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | grep -q "${DNSPLUGIN}"; then
|
||||||
|
echo "Please set the DNSPLUGIN variable to one of the following:"
|
||||||
|
echo "${CERTBOT_DNS_AUTHENTICATORS}"
|
||||||
sleep infinity
|
sleep infinity
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# set_ini_value logic:
|
||||||
|
# - if the name is not found in the file, append the name=value to the end of the file
|
||||||
|
# - if the name is found in the file, replace the value
|
||||||
|
# - if the name is found in the file but commented out, uncomment the line and replace the value
|
||||||
|
# call set_ini_value with parameters: $1=name $2=value $3=file
|
||||||
|
function set_ini_value() {
|
||||||
|
name=${1//\//\\/}
|
||||||
|
value=${2//\//\\/}
|
||||||
|
sed -i \
|
||||||
|
-e '/^#\?\(\s*'"${name}"'\s*=\s*\).*/{s//\1'"${value}"'/;:a;n;ba;q}' \
|
||||||
|
-e '$a'"${name}"'='"${value}" "${3}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ensure config files exist and has at least one value set (set_ini_value does not work on empty files)
|
||||||
|
touch /config/etc/letsencrypt/cli.ini
|
||||||
|
grep -qF 'agree-tos' /config/etc/letsencrypt/cli.ini || echo 'agree-tos=true' >>/config/etc/letsencrypt/cli.ini
|
||||||
|
|
||||||
# copy dns default configs
|
# copy dns default configs
|
||||||
cp -n /defaults/dns-conf/* /config/dns-conf/
|
cp -n /defaults/dns-conf/* /config/dns-conf/ 2> >(grep -v 'cp: not replacing')
|
||||||
lsiown -R abc:abc /config/dns-conf
|
lsiown -R abc:abc /config/dns-conf
|
||||||
|
|
||||||
# copy default renewal hooks
|
# copy default renewal hooks
|
||||||
chmod -R +x /defaults/etc/letsencrypt/renewal-hooks
|
chmod -R +x /defaults/etc/letsencrypt/renewal-hooks
|
||||||
cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/
|
cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/ 2> >(grep -v 'cp: not replacing')
|
||||||
lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
|
lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
|
||||||
|
|
||||||
# replace nginx service location in renewal hooks
|
# replace nginx service location in renewal hooks
|
||||||
@@ -157,21 +176,25 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] ||
|
|||||||
[[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then
|
[[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then
|
||||||
echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created"
|
echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created"
|
||||||
if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]] && [[ -n "${ORIGEMAIL}" ]]; then
|
if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]] && [[ -n "${ORIGEMAIL}" ]]; then
|
||||||
REV_EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=${ORIGEMAIL}")
|
REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90")
|
||||||
REV_ZEROSSL_EAB_KID=$(echo "${REV_EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
|
REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
|
||||||
REV_ZEROSSL_EAB_HMAC_KEY=$(echo "${REV_EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
|
REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
|
||||||
if [[ -z "${REV_ZEROSSL_EAB_KID}" ]] || [[ -z "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
if [[ -z "${REV_ZEROSSL_EAB_KID}" ]] || [[ -z "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
||||||
echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
|
REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
|
||||||
sleep infinity
|
REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
|
||||||
|
fi
|
||||||
|
if [[ -n "${REV_ZEROSSL_EAB_KID}" ]] && [[ -n "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
||||||
|
REV_ACMESERVER+=("--eab-kid" "${REV_ZEROSSL_EAB_KID}" "--eab-hmac-key" "${REV_ZEROSSL_EAB_HMAC_KEY}")
|
||||||
fi
|
fi
|
||||||
REV_ACMESERVER="https://acme.zerossl.com/v2/DV90 --eab-kid ${REV_ZEROSSL_EAB_KID} --eab-hmac-key ${REV_ZEROSSL_EAB_HMAC_KEY}"
|
|
||||||
elif [[ "${ORIGSTAGING}" = "true" ]]; then
|
elif [[ "${ORIGSTAGING}" = "true" ]]; then
|
||||||
REV_ACMESERVER="https://acme-staging-v02.api.letsencrypt.org/directory"
|
REV_ACMESERVER=("https://acme-staging-v02.api.letsencrypt.org/directory")
|
||||||
else
|
else
|
||||||
REV_ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
|
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
||||||
fi
|
fi
|
||||||
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
||||||
certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server ${REV_ACMESERVER} || true
|
certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true
|
||||||
|
else
|
||||||
|
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||||
fi
|
fi
|
||||||
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
||||||
fi
|
fi
|
||||||
@@ -182,9 +205,11 @@ echo -e "ORIGURL=\"${URL}\" ORIGSUBDOMAINS=\"${SUBDOMAINS}\" ORIGONLY_SUBDOMAINS
|
|||||||
# Check if the cert is using the old LE root cert, revoke and regen if necessary
|
# Check if the cert is using the old LE root cert, revoke and regen if necessary
|
||||||
if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "letsencrypt" ]] || [[ "${CERTPROVIDER}" == "" ]]; } && [[ "${STAGING}" != "true" ]] && ! openssl x509 -in /config/keys/letsencrypt/chain.pem -noout -issuer | grep -q "ISRG Root X"; then
|
if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "letsencrypt" ]] || [[ "${CERTPROVIDER}" == "" ]]; } && [[ "${STAGING}" != "true" ]] && ! openssl x509 -in /config/keys/letsencrypt/chain.pem -noout -issuer | grep -q "ISRG Root X"; then
|
||||||
echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking."
|
echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking."
|
||||||
REV_ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
|
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
||||||
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
||||||
certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server ${REV_ACMESERVER} || true
|
certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true
|
||||||
|
else
|
||||||
|
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||||
fi
|
fi
|
||||||
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
||||||
fi
|
fi
|
||||||
@@ -208,52 +233,51 @@ else
|
|||||||
ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
|
ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# figuring out url only vs url & subdomains vs subdomains only
|
set_ini_value "server" "${ACMESERVER}" /config/etc/letsencrypt/cli.ini
|
||||||
|
|
||||||
|
# figuring out domain only vs domain & subdomains vs subdomains only
|
||||||
|
DOMAINS_ARRAY=()
|
||||||
|
if [[ -z "${SUBDOMAINS}" ]] || [[ "${ONLY_SUBDOMAINS}" != true ]]; then
|
||||||
|
DOMAINS_ARRAY+=("${URL}")
|
||||||
|
fi
|
||||||
if [[ -n "${SUBDOMAINS}" ]]; then
|
if [[ -n "${SUBDOMAINS}" ]]; then
|
||||||
echo "SUBDOMAINS entered, processing"
|
echo "SUBDOMAINS entered, processing"
|
||||||
|
SUBDOMAINS_ARRAY=()
|
||||||
if [[ "${SUBDOMAINS}" = "wildcard" ]]; then
|
if [[ "${SUBDOMAINS}" = "wildcard" ]]; then
|
||||||
if [[ "${ONLY_SUBDOMAINS}" = true ]]; then
|
SUBDOMAINS_ARRAY+=("*.${URL}")
|
||||||
export URL_REAL="-d *.${URL}"
|
echo "Wildcard cert for ${URL} will be requested"
|
||||||
echo "Wildcard cert for only the subdomains of ${URL} will be requested"
|
|
||||||
else
|
|
||||||
export URL_REAL="-d *.${URL} -d ${URL}"
|
|
||||||
echo "Wildcard cert for ${URL} will be requested"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "SUBDOMAINS entered, processing"
|
|
||||||
for job in $(echo "${SUBDOMAINS}" | tr "," " "); do
|
for job in $(echo "${SUBDOMAINS}" | tr "," " "); do
|
||||||
export SUBDOMAINS_REAL="${SUBDOMAINS_REAL} -d ${job}.${URL}"
|
SUBDOMAINS_ARRAY+=("${job}.${URL}")
|
||||||
done
|
done
|
||||||
if [[ "${ONLY_SUBDOMAINS}" = true ]]; then
|
echo "Sub-domains processed are: $(echo "${SUBDOMAINS_ARRAY[*]}" | tr " " ",")"
|
||||||
URL_REAL="${SUBDOMAINS_REAL}"
|
|
||||||
echo "Only subdomains, no URL in cert"
|
|
||||||
else
|
|
||||||
URL_REAL="-d ${URL}${SUBDOMAINS_REAL}"
|
|
||||||
fi
|
|
||||||
echo "Sub-domains processed are: ${SUBDOMAINS_REAL}"
|
|
||||||
fi
|
fi
|
||||||
else
|
DOMAINS_ARRAY+=("${SUBDOMAINS_ARRAY[@]}")
|
||||||
echo "No subdomains defined"
|
|
||||||
URL_REAL="-d ${URL}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# add extra domains
|
# add extra domains
|
||||||
if [[ -n "${EXTRA_DOMAINS}" ]]; then
|
if [[ -n "${EXTRA_DOMAINS}" ]]; then
|
||||||
echo "EXTRA_DOMAINS entered, processing"
|
echo "EXTRA_DOMAINS entered, processing"
|
||||||
|
EXTRA_DOMAINS_ARRAY=()
|
||||||
for job in $(echo "${EXTRA_DOMAINS}" | tr "," " "); do
|
for job in $(echo "${EXTRA_DOMAINS}" | tr "," " "); do
|
||||||
export EXTRA_DOMAINS_REAL="${EXTRA_DOMAINS_REAL} -d ${job}"
|
EXTRA_DOMAINS_ARRAY+=("${job}")
|
||||||
done
|
done
|
||||||
echo "Extra domains processed are: ${EXTRA_DOMAINS_REAL}"
|
echo "Extra domains processed are: $(echo "${EXTRA_DOMAINS_ARRAY[*]}" | tr " " ",")"
|
||||||
URL_REAL="${URL_REAL} ${EXTRA_DOMAINS_REAL}"
|
DOMAINS_ARRAY+=("${EXTRA_DOMAINS_ARRAY[@]}")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# setting domains in cli.ini
|
||||||
|
set_ini_value "domains" "$(echo "${DOMAINS_ARRAY[*]}" | tr " " ",")" /config/etc/letsencrypt/cli.ini
|
||||||
|
|
||||||
# figuring out whether to use e-mail and which
|
# figuring out whether to use e-mail and which
|
||||||
if [[ ${EMAIL} == *@* ]]; then
|
if [[ ${EMAIL} == *@* ]]; then
|
||||||
echo "E-mail address entered: ${EMAIL}"
|
echo "E-mail address entered: ${EMAIL}"
|
||||||
EMAILPARAM="-m ${EMAIL} --no-eff-email"
|
set_ini_value "email" "${EMAIL}" /config/etc/letsencrypt/cli.ini
|
||||||
|
set_ini_value "no-eff-email" "true" /config/etc/letsencrypt/cli.ini
|
||||||
|
set_ini_value "register-unsafely-without-email" "false" /config/etc/letsencrypt/cli.ini
|
||||||
else
|
else
|
||||||
echo "No e-mail address entered or address invalid"
|
echo "No e-mail address entered or address invalid"
|
||||||
EMAILPARAM="--register-unsafely-without-email"
|
set_ini_value "register-unsafely-without-email" "true" /config/etc/letsencrypt/cli.ini
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# alter extension for error message
|
# alter extension for error message
|
||||||
@@ -265,37 +289,41 @@ fi
|
|||||||
|
|
||||||
# setting the validation method to use
|
# setting the validation method to use
|
||||||
if [[ "${VALIDATION}" = "dns" ]]; then
|
if [[ "${VALIDATION}" = "dns" ]]; then
|
||||||
AUTHENTICATORPARAM="--authenticator dns-${DNSPLUGIN}"
|
set_ini_value "preferred-challenges" "dns" /config/etc/letsencrypt/cli.ini
|
||||||
DNSCREDENTIALSPARAM="--dns-${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}"
|
set_ini_value "authenticator" "dns-${DNSPLUGIN}" /config/etc/letsencrypt/cli.ini
|
||||||
if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
|
set_ini_value "dns-${DNSPLUGIN}-credentials" "${DNSCREDENTIALFILE}" /config/etc/letsencrypt/cli.ini
|
||||||
|
if [[ -n "${PROPAGATION}" ]]; then set_ini_value "dns-${DNSPLUGIN}-propagation-seconds" "${PROPAGATION}" /config/etc/letsencrypt/cli.ini; fi
|
||||||
|
|
||||||
# plugins that don't support setting credentials file
|
# plugins that don't support setting credentials file
|
||||||
if [[ "${DNSPLUGIN}" =~ ^(route53|standalone)$ ]]; then
|
if [[ "${DNSPLUGIN}" =~ ^(route53|standalone)$ ]]; then
|
||||||
DNSCREDENTIALSPARAM=""
|
sed -i "/^dns-${DNSPLUGIN}-credentials\b/d" /config/etc/letsencrypt/cli.ini
|
||||||
fi
|
fi
|
||||||
# plugins that don't support setting propagation
|
# plugins that don't support setting propagation
|
||||||
if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|route53|standalone)$ ]]; then
|
if [[ "${DNSPLUGIN}" =~ ^(azure|gandi|route53|standalone)$ ]]; then
|
||||||
if [[ -n "${PROPAGATION}" ]]; then echo "${DNSPLUGIN} dns plugin does not support setting propagation time"; fi
|
if [[ -n "${PROPAGATION}" ]]; then echo "${DNSPLUGIN} dns plugin does not support setting propagation time"; fi
|
||||||
PROPAGATIONPARAM=""
|
sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
|
||||||
fi
|
fi
|
||||||
# plugins that use old parameter naming convention
|
# plugins that use old parameter naming convention
|
||||||
if [[ "${DNSPLUGIN}" =~ ^(cpanel)$ ]]; then
|
if [[ "${DNSPLUGIN}" =~ ^(cpanel|directadmin)$ ]]; then
|
||||||
AUTHENTICATORPARAM="--authenticator ${DNSPLUGIN}"
|
sed -i "/^dns-${DNSPLUGIN}-credentials\b/d" /config/etc/letsencrypt/cli.ini
|
||||||
DNSCREDENTIALSPARAM="--${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}"
|
sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
|
||||||
if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
|
set_ini_value "authenticator" "${DNSPLUGIN}" /config/etc/letsencrypt/cli.ini
|
||||||
|
set_ini_value "${DNSPLUGIN}-credentials" "${DNSCREDENTIALFILE}" /config/etc/letsencrypt/cli.ini
|
||||||
|
if [[ -n "${PROPAGATION}" ]]; then set_ini_value "${DNSPLUGIN}-propagation-seconds" "${PROPAGATION}" /config/etc/letsencrypt/cli.ini; fi
|
||||||
fi
|
fi
|
||||||
# don't restore txt records when using DuckDNS plugin
|
# don't restore txt records when using DuckDNS plugin
|
||||||
if [[ "${DNSPLUGIN}" =~ ^(duckdns)$ ]]; then
|
if [[ "${DNSPLUGIN}" =~ ^(duckdns)$ ]]; then
|
||||||
AUTHENTICATORPARAM="${AUTHENTICATORPARAM} --dns-${DNSPLUGIN}-no-txt-restore"
|
set_ini_value "dns-${DNSPLUGIN}-no-txt-restore" "true" /config/etc/letsencrypt/cli.ini
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PREFCHAL="${AUTHENTICATORPARAM} ${DNSCREDENTIALSPARAM} ${PROPAGATIONPARAM}"
|
|
||||||
echo "${VALIDATION} validation via ${DNSPLUGIN} plugin is selected"
|
echo "${VALIDATION} validation via ${DNSPLUGIN} plugin is selected"
|
||||||
elif [[ "${VALIDATION}" = "tls-sni" ]]; then
|
elif [[ "${VALIDATION}" = "tls-sni" ]]; then
|
||||||
PREFCHAL="--standalone --preferred-challenges http"
|
set_ini_value "preferred-challenges" "http" /config/etc/letsencrypt/cli.ini
|
||||||
|
set_ini_value "authenticator" "standalone" /config/etc/letsencrypt/cli.ini
|
||||||
echo "*****tls-sni validation has been deprecated, attempting http validation instead"
|
echo "*****tls-sni validation has been deprecated, attempting http validation instead"
|
||||||
else
|
else
|
||||||
PREFCHAL="--standalone --preferred-challenges http"
|
set_ini_value "preferred-challenges" "http" /config/etc/letsencrypt/cli.ini
|
||||||
|
set_ini_value "authenticator" "standalone" /config/etc/letsencrypt/cli.ini
|
||||||
echo "http validation is selected"
|
echo "http validation is selected"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -304,17 +332,17 @@ if [[ ! -f "/config/keys/letsencrypt/fullchain.pem" ]]; then
|
|||||||
if [[ "${CERTPROVIDER}" = "zerossl" ]] && [[ -n "${EMAIL}" ]]; then
|
if [[ "${CERTPROVIDER}" = "zerossl" ]] && [[ -n "${EMAIL}" ]]; then
|
||||||
echo "Retrieving EAB from ZeroSSL"
|
echo "Retrieving EAB from ZeroSSL"
|
||||||
EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=${EMAIL}")
|
EAB_CREDS=$(curl -s https://api.zerossl.com/acme/eab-credentials-email --data "email=${EMAIL}")
|
||||||
ZEROSSL_EAB_KID=$(echo "${EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_kid'])")
|
ZEROSSL_EAB_KID=$(echo "${EAB_CREDS}" | jq .eab_kid)
|
||||||
ZEROSSL_EAB_HMAC_KEY=$(echo "${EAB_CREDS}" | python3 -c "import sys, json; print(json.load(sys.stdin)['eab_hmac_key'])")
|
ZEROSSL_EAB_HMAC_KEY=$(echo "${EAB_CREDS}" | jq .eab_hmac_key)
|
||||||
if [[ -z "${ZEROSSL_EAB_KID}" ]] || [[ -z "${ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
if [[ -z "${ZEROSSL_EAB_KID}" ]] || [[ -z "${ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
||||||
echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
|
echo "Unable to retrieve EAB credentials from ZeroSSL. Check the outgoing connections to api.zerossl.com and dns. Sleeping."
|
||||||
sleep infinity
|
sleep infinity
|
||||||
fi
|
fi
|
||||||
ZEROSSL_EAB="--eab-kid ${ZEROSSL_EAB_KID} --eab-hmac-key ${ZEROSSL_EAB_HMAC_KEY}"
|
set_ini_value "eab-kid" "${ZEROSSL_EAB_KID}" /config/etc/letsencrypt/cli.ini
|
||||||
|
set_ini_value "eab-hmac-key" "${ZEROSSL_EAB_HMAC_KEY}" /config/etc/letsencrypt/cli.ini
|
||||||
fi
|
fi
|
||||||
echo "Generating new certificate"
|
echo "Generating new certificate"
|
||||||
# shellcheck disable=SC2086
|
certbot certonly --non-interactive --renew-by-default
|
||||||
certbot certonly --non-interactive --renew-by-default --server ${ACMESERVER} ${ZEROSSL_EAB} ${PREFCHAL} --rsa-key-size 4096 ${EMAILPARAM} --agree-tos ${URL_REAL}
|
|
||||||
if [[ ! -d /config/keys/letsencrypt ]]; then
|
if [[ ! -d /config/keys/letsencrypt ]]; then
|
||||||
if [[ "${VALIDATION}" = "dns" ]]; then
|
if [[ "${VALIDATION}" = "dns" ]]; then
|
||||||
echo "ERROR: Cert does not exist! Please see the validation error above. Make sure you entered correct credentials into the ${DNSCREDENTIALFILE} file."
|
echo "ERROR: Cert does not exist! Please see the validation error above. Make sure you entered correct credentials into the ${DNSCREDENTIALFILE} file."
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ if [[ ! -f /config/crontabs/root ]]; then
|
|||||||
|
|
||||||
# if crontabs still do not exist in config (were not copied from system)
|
# if crontabs still do not exist in config (were not copied from system)
|
||||||
# copy crontab from included defaults (using -n, do not overwrite an existing file)
|
# copy crontab from included defaults (using -n, do not overwrite an existing file)
|
||||||
cp -n /etc/crontabs/root /config/crontabs/
|
cp -n /etc/crontabs/root /config/crontabs/ 2> >(grep -v 'cp: not replacing')
|
||||||
fi
|
fi
|
||||||
# set permissions and import user crontabs
|
# set permissions and import user crontabs
|
||||||
lsiown root:root /config/crontabs/root
|
lsiown root:root /config/crontabs/root
|
||||||
@@ -31,7 +31,7 @@ if [[ ! -f /config/crontabs/abc ]]; then
|
|||||||
|
|
||||||
# if crontabs still do not exist in config (were not copied from system)
|
# if crontabs still do not exist in config (were not copied from system)
|
||||||
# copy crontab from included defaults (using -n, do not overwrite an existing file)
|
# copy crontab from included defaults (using -n, do not overwrite an existing file)
|
||||||
cp -n /etc/crontabs/abc /config/crontabs/
|
cp -n /etc/crontabs/abc /config/crontabs/ 2> >(grep -v 'cp: not replacing')
|
||||||
fi
|
fi
|
||||||
# set permissions and import user crontabs
|
# set permissions and import user crontabs
|
||||||
lsiown abc:abc /config/crontabs/abc
|
lsiown abc:abc /config/crontabs/abc
|
||||||
|
|||||||
Reference in New Issue
Block a user