Skip to content

Commit 6ed17c1

Browse files
authored
Merge branch 'master' into 3.19
2 parents 24b3540 + e568785 commit 6ed17c1

7 files changed

Lines changed: 186 additions & 185 deletions

File tree

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ RUN \
106106
certbot-dns-duckdns \
107107
certbot-dns-freedns \
108108
certbot-dns-gehirn \
109+
certbot-dns-glesys \
109110
certbot-dns-godaddy \
110111
certbot-dns-google \
111112
certbot-dns-google-domains \

Dockerfile.aarch64

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ RUN \
106106
certbot-dns-duckdns \
107107
certbot-dns-freedns \
108108
certbot-dns-gehirn \
109+
certbot-dns-glesys \
109110
certbot-dns-godaddy \
110111
certbot-dns-google \
111112
certbot-dns-google-domains \

Jenkinsfile

Lines changed: 148 additions & 139 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ To help you get started creating a container from this image you can either use
158158

159159
```yaml
160160
---
161-
version: "2.1"
162161
services:
163162
swag:
164163
image: lscr.io/linuxserver/swag:latest
@@ -228,7 +227,7 @@ Containers are configured using parameters passed at runtime (such as those abov
228227
| `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
229228
| `-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) |
230229
| `-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. |
231-
| `-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`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `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`. |
230+
| `-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`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `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`. |
232231
| `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
233232
| `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
234233
| `-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` |
@@ -309,7 +308,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
309308

310309
## Updating Info
311310

312-
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
311+
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
313312

314313
Below are the instructions for updating containers:
315314

@@ -374,21 +373,6 @@ Below are the instructions for updating containers:
374373
docker image prune
375374
```
376375

377-
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
378-
379-
* Pull the latest image at its tag and replace it with the same env variables in one run:
380-
381-
```bash
382-
docker run --rm \
383-
-v /var/run/docker.sock:/var/run/docker.sock \
384-
containrrr/watchtower \
385-
--run-once swag
386-
```
387-
388-
* You can also remove the old dangling images: `docker image prune`
389-
390-
**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
391-
392376
### Image Update Notifications - Diun (Docker Image Update Notifier)
393377

394378
**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
@@ -416,7 +400,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
416400

417401
## Versions
418402

419-
* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
403+
* **23.01.24:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
404+
* **01.01.24:** - Add GleSYS DNS plugin.
420405
* **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins.
421406
* **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404.
422407
* **23.11.23:** - Run certbot as root to allow fix http validation.

package_versions.txt

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,24 @@ alpine-baselayout 3.4.3-r1 apk
99
alpine-baselayout-data 3.4.3-r1 apk
1010
alpine-keys 2.4-r1 apk
1111
alpine-release 3.18.5-r0 apk
12-
anyio 4.2.0 python
1312
aom-libs 3.6.1-r0 apk
1413
apache2-utils 2.4.58-r0 apk
1514
apk-tools 2.14.0-r2 apk
1615
apr 1.7.4-r0 apk
1716
apr-util 1.6.3-r1 apk
1817
argon2-libs 20190702-r4 apk
19-
attrs 23.1.0 python
18+
attrs 23.2.0 python
2019
azure-common 1.1.28 python
21-
azure-core 1.29.6 python
20+
azure-core 1.29.7 python
2221
azure-identity 1.15.0 python
2322
azure-mgmt-core 1.4.0 python
2423
azure-mgmt-dns 8.1.0 python
2524
bash 5.2.15-r5 apk
26-
beautifulsoup4 4.12.2 python
27-
boto3 1.34.7 python
28-
botocore 1.34.7 python
25+
beautifulsoup4 4.12.3 python
26+
boto3 1.34.23 python
27+
botocore 1.34.23 python
2928
brotli-libs 1.0.9-r14 apk
30-
bs4 0.0.1 python
29+
bs4 0.0.2 python
3130
busybox 1.36.1-r5 apk
3231
busybox-binsh 1.36.1-r5 apk
3332
c-client 2007f-r15 apk
@@ -53,14 +52,15 @@ certbot-dns-dreamhost 1.0 python
5352
certbot-dns-duckdns 1.3 python
5453
certbot-dns-freedns 0.1.0 python
5554
certbot-dns-gehirn 2.8.0 python
56-
certbot-dns-godaddy 2.7.4 python
55+
certbot-dns-glesys 2.1.0 python
56+
certbot-dns-godaddy 2.8.0 python
5757
certbot-dns-google 2.8.0 python
5858
certbot-dns-google-domains 0.1.11 python
5959
certbot-dns-he 1.0.0 python
6060
certbot-dns-hetzner 2.0.0 python
61-
certbot-dns-infomaniak 0.2.1 python
61+
certbot-dns-infomaniak 0.2.2 python
6262
certbot-dns-inwx 2.2.0 python
63-
certbot-dns-ionos 2023.11.13.post1 python
63+
certbot-dns-ionos 2024.1.8 python
6464
certbot-dns-linode 2.8.0 python
6565
certbot-dns-loopia 1.0.1 python
6666
certbot-dns-luadns 2.8.0 python
@@ -80,16 +80,16 @@ certbot-plugin-gandi 1.5.0 python
8080
certifi 2023.11.17 python
8181
cffi 1.16.0 python
8282
charset-normalizer 3.3.2 python
83-
cloudflare 2.14.3 python
83+
cloudflare 2.16.0 python
8484
composer 2.6.6 binary
8585
configobj 5.0.8 python
8686
coreutils 9.3-r1 apk
8787
cryptography 41.0.7 python
8888
curl 8.5.0-r0 apk
8989
dataclasses-json 0.5.14 python
90-
distro 1.8.0 python
90+
distro 1.9.0 python
9191
dns-lexicon 3.17.0 python
92-
dnslib 0.9.23 python
92+
dnslib 0.9.24 python
9393
dnspython 2.4.2 python
9494
domeneshop 0.4.3 python
9595
fail2ban 1.0.2 python
@@ -109,10 +109,10 @@ gnupg-gpgconf 2.4.3-r0 apk
109109
gnupg-keyboxd 2.4.3-r0 apk
110110
gnupg-utils 2.4.3-r0 apk
111111
gnupg-wks-client 2.4.3-r0 apk
112-
gnutls 3.8.0-r2 apk
112+
gnutls 3.8.3-r0 apk
113113
google-api-core 2.15.0 python
114-
google-api-python-client 2.111.0 python
115-
google-auth 2.25.2 python
114+
google-api-python-client 2.114.0 python
115+
google-auth 2.26.2 python
116116
google-auth-httplib2 0.2.0 python
117117
googleapis-common-protos 1.62.0 python
118118
gpg 2.4.3-r0 apk
@@ -139,7 +139,7 @@ libavif 0.11.1-r2 apk
139139
libbsd 0.11.7-r1 apk
140140
libbz2 1.0.8-r5 apk
141141
libc-utils 0.7.2-r5 apk
142-
libcrypto3 3.1.4-r1 apk
142+
libcrypto3 3.1.4-r4 apk
143143
libcurl 8.5.0-r0 apk
144144
libdav1d 1.2.1-r0 apk
145145
libedit 20221030.3.1-r1 apk
@@ -171,7 +171,7 @@ libsasl 2.1.28-r4 apk
171171
libseccomp 2.5.4-r2 apk
172172
libsm 1.2.4-r1 apk
173173
libsodium 1.0.18-r3 apk
174-
libssl3 3.1.4-r1 apk
174+
libssl3 3.1.4-r4 apk
175175
libstdc++ 12.2.1_git20220924-r10 apk
176176
libtasn1 4.19.0-r1 apk
177177
libunistring 1.1-r1 apk
@@ -190,9 +190,9 @@ libzip 1.9.2-r2 apk
190190
linux-pam 1.5.2-r10 apk
191191
logrotate 3.21.0-r1 apk
192192
loopialib 0.2.0 python
193-
lxml 4.9.4 python
193+
lxml 5.1.0 python
194194
lz4-libs 1.9.4-r4 apk
195-
marshmallow 3.20.1 python
195+
marshmallow 3.20.2 python
196196
memcached 1.6.21-r0 apk
197197
mock 5.1.0 python
198198
mpdecimal 2.5.1-r2 apk
@@ -227,7 +227,7 @@ nginx-mod-stream-geoip2 1.24.0-r7 apk
227227
nginx-vim 1.24.0-r7 apk
228228
npth 1.6-r4 apk
229229
oniguruma 6.9.8-r1 apk
230-
openssl 3.1.4-r1 apk
230+
openssl 3.1.4-r4 apk
231231
p11-kit 0.24.1-r2 apk
232232
packaging 23.2 python
233233
parsedatetime 2.6 python
@@ -291,7 +291,7 @@ pkb-client 1.2 python
291291
popt 1.19-r2 apk
292292
portalocker 2.8.2 python
293293
procps-ng 4.0.4-r0 apk
294-
protobuf 4.25.1 python
294+
protobuf 4.25.2 python
295295
publicsuffixlist 0.9.4 python
296296
pyOpenSSL 23.3.0 python
297297
pyRFC3339 1.1 python
@@ -320,15 +320,14 @@ setuptools 65.5.0 python
320320
shadow 4.13-r4 apk
321321
six 1.16.0 python
322322
skalibs 2.13.1.1-r1 apk
323-
sniffio 1.3.0 python
324323
soupsieve 2.5 python
325-
sqlite-libs 3.41.2-r2 apk
324+
sqlite-libs 3.41.2-r3 apk
326325
ssl_client 1.36.1-r5 apk
327326
tiff 4.5.1-r0 apk
328327
tldextract 5.1.1 python
329328
typing-inspect 0.9.0 python
330329
typing_extensions 4.9.0 python
331-
tzdata 2023c-r1 apk
330+
tzdata 2023d-r0 apk
332331
unixodbc 2.3.11-r2 apk
333332
uritemplate 4.1.1 python
334333
urllib3 2.0.7 python

readme-vars.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ opt_param_usage_include_env: true
5050
opt_param_env_vars:
5151
- { 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)" }
5252
- { 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." }
53-
- { 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`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `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`." }
53+
- { 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`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `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`." }
5454
- { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
5555
- { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
5656
- { 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`" }
@@ -168,7 +168,8 @@ app_setup_block: |
168168
169169
# changelog
170170
changelogs:
171-
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
171+
- { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
172+
- { date: "01.01.24:", desc: "Add GleSYS DNS plugin." }
172173
- { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }
173174
- { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." }
174175
- { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." }

root/defaults/dns-conf/glesys.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Instructions: https://github.com/runfalk/certbot-dns-glesys#usage
2+
3+
# GleSYS API credentials used by Certbot
4+
dns_glesys_user = CL00000
5+
dns_glesys_password = apikeygoeshere

0 commit comments

Comments
 (0)