trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,199 Commits 95 Branches 330 Tags 336 MiB
Commit Graph

654 Commits

Author SHA1 Message Date
Jens Langhammer 21f92b4a65 website/docs: add docs for customisation 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-04-06 00:06:28 +02:00
Jens L 633296503d
core: add grouping to applications (#2648) 
* core: add grouping to applications

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* core: add new field to tests

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-04-02 23:08:58 +02:00
Jens L 508cec2fd5
web: migrate dropdowns to wizards (#2633) 
* web/admin: add basic wizards for providers

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web: add dark mode for wizard

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/admin: migrate policies to wizard

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* start source

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* policies: sanitze_dict when returning log messages during tests

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* Revert "web/admin: migrate policies to wizard"

This reverts commit d8b7f62d3e.

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	web/src/locales/zh-Hans.po
#	web/src/locales/zh-Hant.po
#	web/src/locales/zh_TW.po

* web: rewrite wizard to be element based

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* further cleanup

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* update sources

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web: migrate property mappings

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* migrate stages

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* migrate misc dropdowns

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* migrate outpost integrations

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-04-02 19:48:17 +02:00
Jens Langhammer 4be238018b providers/oauth2: pass scope and other parameters to access policy request context 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

#2641
 2022-04-01 21:39:05 +02:00
Jens Langhammer 8689444954 providers/oauth2: add password grant support (treated as client_credentials) 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-31 18:02:17 +02:00
Jens L bb8af2f19b
providers/oauth2: add client_assertion_type jwt bearer support (#2618) 2022-03-31 00:30:55 +02:00
Jens Langhammer ac03f5a97d website/docs: prepare 2022.4 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-30 23:43:36 +02:00
Andre Mainka 0c53650216
website/docs: terminology clear unneeded sentence. (#2577) 
certificates: minor improvements
 2022-03-23 17:38:36 +01:00
Bhautik 8e028c2feb
website/docs: added missing client_id in client_credential grant type (#2576) 2022-03-23 15:07:09 +01:00
Jens Langhammer 9ad4c736f1 stages/email: allow overriding of destination email in plan context 
closes #2445

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-22 21:19:34 +01:00
Jens Langhammer 73fe866cb6 website/docs: prepare 2022.3.3 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-21 22:37:01 +01:00
CRoudsarabi 0f56d00959
website/docs: added example for custom user attributes (#2406) 
* added example for custom user attributes

* simplified example

Co-authored-by: croudsarabi <constantin.roudsarabi@andrena.de>
 2022-03-15 18:12:02 +01:00
Jens Langhammer 37df054f4c website/docs: prepare 2022.3.2 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-14 23:59:38 +01:00
Jens Langhammer 47601a767b website/docs: fix invalid queries in docs 
closes #2482
 2022-03-14 12:38:22 +00:00
Jens Langhammer c1e4d78672 root: deprecate :stable tag 
#2439

we haven't released an -rc release in a while and I don't really see a need for them anymore, so lets simplify the release process

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-09 23:48:32 +01:00
Jens Langhammer 0ab427b5bb website/docs: prepare 2022.3 release 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-09 23:42:25 +01:00
Jens Langhammer a9f095d1d9 website/docs: add docs for different flow executors 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-09 23:36:09 +01:00
Jens L 920d1f1b0e
providers/oauth2: initial client_credentials grant support (#2437) 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-05 23:24:55 +01:00
Jens L 4f4f954693
core: customisable user settings (#2397) 
* tenants: add user_settings flow, add basic flow and basic new executor

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/user: use flow PromptStage instead of custom stage

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/flows: add tenant to StageHost interface

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/user: fix form missing component

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/user: re-add success message

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/user: improve support for multiple error messages

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* stages/prompt: allow expressions in prompt placeholders

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* stages/prompt: add tests

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* flows: always set pending user

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* flows: never cache stage configuration flow plans

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* stages/user_write: fix error when pending user is anonymous user

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/admin: add checkbox for prompt placeholder expression

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* website/docs: add prompt expression docs

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* stages/prompt: add ak-locale field type

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* tenants: fix default policy

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/user: add function to do global refresh

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* web/flows: fix rendering of ak-locale

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* tenants: fix default policy, add error handling to placeholder, fix locale attribute

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* add tests

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-03-03 00:13:06 +01:00
Jens Langhammer 133528ee90 website/docs: add email sender name explanation 
closes #2378

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-24 10:39:33 +01:00
Jens L 677bcaadd7
core: add initial app launch url (#2367) 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-23 22:48:55 +01:00
Jens Langhammer 49c4b43f32 website/docs: better explain icon URL behaviour 
closes #2337

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-17 22:37:17 +01:00
Jens Langhammer c5b84a91d1 website/docs: add 2022.2 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-16 10:27:25 +01:00
Jens Langhammer 4e317c10c5 Revert "website/docs: revert to akprox for now" 
This reverts commit 9070df6c26.

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	website/docs/providers/proxy/_nginx_ingress.md
#	website/docs/providers/proxy/_nginx_proxy_manager.md
#	website/docs/providers/proxy/_nginx_standalone.md
 2022-02-16 10:19:33 +01:00
Jens Langhammer 908f123d0e website/docs: update nginx config 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-15 10:24:08 +01:00
Jens Langhammer ff7320b0f8 website/docs: update nginx ingress docs again 
closes #2235

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-13 14:48:47 +01:00
Jens Langhammer 0a7bafd1b2 website/docs: add nginx note for domain auth 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-12 18:14:14 +01:00
Jens Langhammer b3987c5fa0 website/docs: update nginx ingress docs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

#2235
 2022-02-12 18:06:04 +01:00
Jens Langhammer 0da043a9fe outposts: make local discovery configurable 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-12 17:27:41 +01:00
Jens Langhammer 9070df6c26 website/docs: revert to akprox for now 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-11 23:37:46 +01:00
Jens Langhammer 1f838bb2aa outposts/proxy: add X-Forwarded-Host since Host now gets changed by the proxy 
closes #2284

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-10 23:09:55 +01:00
Jens Langhammer c14025c579 Merge branch 'version-2022.1' 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	poetry.lock
 2022-02-09 22:45:26 +01:00
Jens Langhammer 511a94975b website/docs: add 2022.1.5 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-09 22:31:14 +01:00
Jens Langhammer 6314be14ad core: allow formatting strings to be used for applications' launch URLs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-09 22:22:29 +01:00
Jens Langhammer 0d92112a3f website/docs: add backend_override docs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-09 10:41:42 +01:00
Jens Langhammer b1ad3ec9db website/docs: highlight breaking nginx header change 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-09 10:33:04 +01:00
Jens Langhammer e741caa6b3 core: allow formatting strings to be used for applications' launch URLs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-08 23:46:23 +01:00
Jens L 4343246a41
*: rename akprox to outpost.goauthentik.io (#2266) 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-08 20:25:38 +01:00
lyh16 6c880e0e62
website/docs: Enable 'secure' option for pwgen (#2260) 
* Enable 'secure' option for pwgen

As per the [pwgen manual](https://linux.die.net/man/1/pwgen, "pwgen manual"), the "-s"(secure) option instructs pwgen to generate completely random passwords, where as the default for pwgen is to generate more memorable passwords. Since, the passwords generated in this part of the installation process are to be "remembered" by the dot env file, I believe that users may benefit from the additional entropy provided by the "-s" option in pwgen.

* Enable 'secure' option for pwgen
 2022-02-08 12:24:29 +01:00
Jens Langhammer 20c284a188 website/docs: improve docs for application access 
closes #2245

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-07 19:42:42 +01:00
Jens L d5e04a2301
*: remove deprecated backup (#2129) 
* *: remove backup

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* fix lint

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* website/docs: add docs

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* *: final cleanup

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* ci: use correct pyproject when migrating from stable

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

* website/docs: fix broken docs

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-05 18:54:15 +01:00
Daniel Thorpe 3189c56fc3
website/docs: default to upgrade with install flag set (#2234) 2022-02-04 22:36:34 +01:00
Jens Langhammer 814758e2aa website/docs: prepare 2022.1.4 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-02-01 19:27:25 +01:00
Jens Langhammer 88603fa4f7 providers/proxy: set traefik labels using object_naming_template instead of UUID 2022-02-01 17:13:27 +00:00
Jens Langhammer e93be0de9a sources/ldap: add list_flatten function to property mappings, enable on managed LDAP mappings 
closes #2199

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-31 23:07:32 +01:00
Jens Langhammer a908cad976 website/docs: add release notes for 2022.1.3 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-26 21:41:15 +01:00
Jens Langhammer 63b3434b6f website/docs: improve nginx examples 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-25 14:25:21 +01:00
Jens Langhammer 3ed23a37ea website/docs: add 2022.1.2 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-24 11:34:13 +01:00
Jens Langhammer 2997542114 lib: disable backup by default, add note to configuration 2022-01-24 10:00:15 +00:00
Jens Langhammer 42f5cf8c93 outposts: allow custom label for docker containers 
closes #2128

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-23 21:55:58 +01:00
Jens Langhammer 08af2fd46b website/docs: deprecate inbuilt backup 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-23 21:51:22 +01:00
Jens Langhammer 5f198e7fe4 website/docs: update 2022.1 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-22 12:29:20 +01:00
Jens Langhammer dd8b579dd6 lib: ignore paramiko logger 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-21 10:46:33 +01:00
Jens Langhammer e12cbd8711 website/docs: add 2022.1 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-21 09:47:49 +01:00
Jens Langhammer 4db370d24e website/docs: add flow inspector docs 
closes #2105

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-19 19:31:21 +01:00
Miguel Martínez 64a2126ea4
website/docs: fix typo in port mapping in manifest (#2103) 
Otherwise it causes:

```
error: error validating "outpost.yaml": error validating data: ValidationError(Service.spec.ports[1].port): invalid type for io.k8s.api.core.v1.ServicePort.port: got "string", expected "integer"; if you choose to ignore these errors, turn validation off with --validate=false
```
 2022-01-18 19:57:55 +01:00
Jens Langhammer 01bb18b8c4 root: allow customisation of ports in compose without override 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-17 14:48:02 +01:00
Jens Langhammer 1d7c7801e7 website/docs: prepare 2022.1 release 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-16 18:22:25 +01:00
Jens Langhammer 819af78e2b internal: make internal go version match python version 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-14 10:45:37 +01:00
Jens Langhammer 4e476fd4e9 website/docs: update 2021.12.5 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-06 21:15:27 +01:00
Jens Langhammer 5769ff45b5 core: add goauthentik.io/user/can-change-name 
closes #2054

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-04 19:03:12 +01:00
Jens Langhammer ec84ba9b6d website/docs: prepare 2021.12.5 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2022-01-04 18:35:45 +01:00
Jens Langhammer 952a7f07c1 website/docs: fix typo 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-25 16:38:56 +01:00
Jens Langhammer 6510b97c1e outposts: add remote docker integration via SSH 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-25 16:31:34 +01:00
Jens Langhammer 2520c92b78 website/docs: add additional docs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-23 18:51:18 +01:00
Jens Langhammer 5c5634830f stages/identification: add field for passwordless flow 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-23 18:27:00 +01:00
Jens Langhammer b6b0edb7ad website/docs: use compose override for certbot instead separate stack 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-23 18:03:35 +01:00
Jens Langhammer e9a477c1eb root: cleanup bumpversion config 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-23 10:32:46 +01:00
Jens Langhammer 457e17fec3 website/docs: add small let's encrypt docs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-23 00:59:06 +01:00
Jens Langhammer 6f32eeea43 website/docs: prepare 2021.12.4 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-22 23:37:04 +01:00
Jens Langhammer f557b2129f *: fix random typos 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-22 23:13:18 +01:00
Jens Langhammer c1f0833c09 crypto: improve support for non-rsa private keys (discovery) 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-22 21:46:22 +01:00
Jens Langhammer a3c681cc44 website/docs: cleanup old image names 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-22 17:38:09 +01:00
Jens Langhammer 5b3a9e29fb stages/authenticator_validate: add passwordless login 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-22 17:34:46 +01:00
Jens Langhammer 15803dc67d website/docs: revert traefik to not use header regex 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-22 15:30:01 +01:00
Jens Langhammer cf4b4030aa release: 2021.12.3 2021-12-21 20:52:08 +01:00
Jens Langhammer 29e9f399bd website/docs: prepare 2021.12.3 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-21 19:50:24 +01:00
Jens Langhammer ca314c262c *: revert to using GHCR directly 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-21 13:54:49 +01:00
Jens Langhammer b932b6c963 website/docs: update log levels 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-21 13:15:17 +01:00
Jens Langhammer 4658018a90 Revert "outposts: rename outpost" 
This reverts commit a5c30fd9c7.
 2021-12-20 21:37:31 +01:00
Jens Langhammer 577b7ee515 providers/proxy: include auth headers 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-20 21:37:22 +01:00
Jens Langhammer a5c30fd9c7 outposts: rename outpost 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-20 19:28:05 +01:00
Jens Langhammer ef23a0da52 outposts/proxy: fix traefik header regex to only match Remote- and X- headers to prevent websocket errors 
closes #1969

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-20 13:30:19 +01:00
Jens Langhammer e9910732bc release: 2021.12.2 2021-12-18 21:03:50 +01:00
Jens Langhammer 44f62a4773 website/docs: add 2021.12.2 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-18 20:39:16 +01:00
Jens Langhammer 7a73ddfb60 outposts/proxy: match skipPathRegex against full URL on domain auth 
closes #1955

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-18 15:50:42 +01:00
Jens Langhammer 8cc3cb6a42 website/docs: fix reference to non-existent version 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-18 15:34:39 +01:00
Jens Langhammer f33190caa5 release: 2021.12.1 2021-12-16 15:48:59 +01:00
Jens Langhammer 741822424a Merge branch 'master' into version-2021.12 2021-12-16 15:48:53 +01:00
Jens Langhammer 0ca6fbb224 website/docs: final 2021.12.1 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-16 15:48:47 +01:00
Jens Langhammer 7c71c52791 web/admin: add sidebar to applications 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-16 12:23:30 +01:00
Jens Langhammer 2a09fc0ae2 release: 2021.12.1-rc5 2021-12-15 10:21:29 +01:00
Jens Langhammer fbb6756488 Merge branch 'master' into version-2021.12 2021-12-15 10:16:05 +01:00
Jens Langhammer f45fb2eac0 website/docs: prepare 2021.12.1-rc5 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-15 10:15:58 +01:00
Jens Langhammer 708ff300a3 website: remove remaining /index URLs 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-13 19:01:16 +01:00
Jens Langhammer f3b3ce6572 website/docs: add 2021.12.1-rc4 release notes 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-13 12:56:34 +01:00
Jens Langhammer 09b02e1aec release: 2021.12.1-rc4 2021-12-13 12:53:58 +01:00
Jens Langhammer 451a9aaf01 Merge branch 'master' into version-2021.12 2021-12-13 12:53:50 +01:00
Jens Langhammer a010c91a52 website/docs: update references for new docusaurus version 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
 2021-12-13 11:56:26 +01:00
Jens Langhammer 5914bbf173 Merge branch 'master' into version-2021.12 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	Dockerfile
 2021-12-13 10:54:21 +01:00