From d4e1b959918e4afd4913ee00ecaeb947f0786909 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 6 Oct 2021 09:18:01 +0200 Subject: [PATCH 1/3] root: fix syntax error in dockerfile healthcheck Signed-off-by: Jens Langhammer --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dfd5e46b..1718b113c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,6 +86,6 @@ ENV PYTHONUNBUFFERED 1 ENV prometheus_multiproc_dir /dev/shm/ ENV PATH "/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/lifecycle" -HEALTHCHECK --interval=30s --timeout=30s --start-period=60s --retries=3 CMD [ "/lifecycle/ak healthcheck" ] +HEALTHCHECK --interval=30s --timeout=30s --start-period=60s --retries=3 CMD [ "/lifecycle/ak", "healthcheck" ] ENTRYPOINT [ "/lifecycle/ak" ] From 3869965b4cb9cbd0fee324526201a3153cc21ae1 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 6 Oct 2021 20:50:43 +0200 Subject: [PATCH 2/3] web/admin: fix description for flow import Signed-off-by: Jens Langhammer # Conflicts: # web/src/locales/fr_FR.po --- web/src/locales/en.po | 5 ++++- web/src/locales/fr_FR.po | 8 ++++++-- web/src/locales/pseudo-LOCALE.po | 5 ++++- web/src/pages/flows/FlowImportForm.ts | 4 +++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 25e724f9b..f5ad91ab2 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -44,6 +44,10 @@ msgstr "(Format: hours=-1;minutes=-2;seconds=-3)." msgid "-" msgstr "-" +#: src/pages/flows/FlowImportForm.ts +msgid ".akflow files, which can be found on goauthentik.io and can be exported by authentik." +msgstr ".akflow files, which can be found on goauthentik.io and can be exported by authentik." + #: src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts msgid "6 digits, widely compatible" msgstr "6 digits, widely compatible" @@ -478,7 +482,6 @@ msgstr "Background image" #: src/pages/flows/FlowForm.ts #: src/pages/flows/FlowForm.ts -#: src/pages/flows/FlowImportForm.ts msgid "Background shown during execution." msgstr "Background shown during execution." diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po index 35ac5b48f..f1501fa87 100644 --- a/web/src/locales/fr_FR.po +++ b/web/src/locales/fr_FR.po @@ -46,6 +46,10 @@ msgstr "(Format : heures=-1;minutes=-2;seconds=-3)" msgid "-" msgstr "-" +#: src/pages/flows/FlowImportForm.ts +msgid ".akflow files, which can be found on goauthentik.io and can be exported by authentik." +msgstr "" + #: src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts msgid "6 digits, widely compatible" msgstr "6 chiffres, compatibilité large" @@ -501,8 +505,8 @@ msgstr "Arrière-plan" msgid "Background image" msgstr "Image d'arrière-plan" -#: src/pages/flows/FlowForm.ts src/pages/flows/FlowForm.ts -#: src/pages/flows/FlowImportForm.ts +#: src/pages/flows/FlowForm.ts +#: src/pages/flows/FlowForm.ts msgid "Background shown during execution." msgstr "Arrière-plan utilisé durant l'exécution." diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 83de1060c..90aa1b1a4 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -44,6 +44,10 @@ msgstr "" msgid "-" msgstr "" +#: src/pages/flows/FlowImportForm.ts +msgid ".akflow files, which can be found on goauthentik.io and can be exported by authentik." +msgstr "" + #: src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts msgid "6 digits, widely compatible" msgstr "" @@ -474,7 +478,6 @@ msgstr "" #: src/pages/flows/FlowForm.ts #: src/pages/flows/FlowForm.ts -#: src/pages/flows/FlowImportForm.ts msgid "Background shown during execution." msgstr "" diff --git a/web/src/pages/flows/FlowImportForm.ts b/web/src/pages/flows/FlowImportForm.ts index b52c6b268..0e5158f01 100644 --- a/web/src/pages/flows/FlowImportForm.ts +++ b/web/src/pages/flows/FlowImportForm.ts @@ -30,7 +30,9 @@ export class FlowImportForm extends Form { return html`
-

${t`Background shown during execution.`}

+

+ ${t`.akflow files, which can be found on goauthentik.io and can be exported by authentik.`} +

`; } From e444d0d6408b977398b0b9c5cd03df28d414b9fe Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 6 Oct 2021 20:57:56 +0200 Subject: [PATCH 3/3] release: 2021.9.7 --- .bumpversion.cfg | 2 +- .github/workflows/release-publish.yml | 20 +++++++++---------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- schema.yml | 2 +- web/src/constants.ts | 2 +- website/docs/installation/docker-compose.md | 4 ++-- .../outposts/manual-deploy-docker-compose.md | 4 ++-- .../docs/outposts/manual-deploy-kubernetes.md | 14 ++++++------- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7974f3b5b..624de45db 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.9.6 +current_version = 2021.9.7 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index aaca47fa5..368573ab5 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -33,14 +33,14 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik:2021.9.6, + beryju/authentik:2021.9.7, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.9.6, + ghcr.io/goauthentik/server:2021.9.7, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64 context: . - name: Building Docker Image (stable) - if: ${{ github.event_name == 'release' && !contains('2021.9.6', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.9.7', 'rc') }} run: | docker pull beryju/authentik:latest docker tag beryju/authentik:latest beryju/authentik:stable @@ -75,14 +75,14 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-proxy:2021.9.6, + beryju/authentik-proxy:2021.9.7, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.9.6, + ghcr.io/goauthentik/proxy:2021.9.7, ghcr.io/goauthentik/proxy:latest file: proxy.Dockerfile platforms: linux/amd64,linux/arm64 - name: Building Docker Image (stable) - if: ${{ github.event_name == 'release' && !contains('2021.9.6', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.9.7', 'rc') }} run: | docker pull beryju/authentik-proxy:latest docker tag beryju/authentik-proxy:latest beryju/authentik-proxy:stable @@ -117,14 +117,14 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-ldap:2021.9.6, + beryju/authentik-ldap:2021.9.7, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.9.6, + ghcr.io/goauthentik/ldap:2021.9.7, ghcr.io/goauthentik/ldap:latest file: ldap.Dockerfile platforms: linux/amd64,linux/arm64 - name: Building Docker Image (stable) - if: ${{ github.event_name == 'release' && !contains('2021.9.6', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.9.7', 'rc') }} run: | docker pull beryju/authentik-ldap:latest docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable @@ -175,7 +175,7 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.9.6 + version: authentik@2021.9.7 environment: beryjuorg-prod sourcemaps: './web/dist' url_prefix: '~/static/dist' diff --git a/authentik/__init__.py b/authentik/__init__.py index 1316b287c..de034b079 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.9.6" +__version__ = "2021.9.7" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index a1ef7c682..fc71c7e76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: image: redis:alpine restart: unless-stopped server: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.6} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.7} restart: unless-stopped command: server environment: @@ -38,7 +38,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.6} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.7} restart: unless-stopped command: worker environment: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index adf024374..6a3f1861b 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -17,4 +17,4 @@ func OutpostUserAgent() string { return fmt.Sprintf("authentik-outpost@%s (build=%s)", VERSION, BUILD()) } -const VERSION = "2021.9.6" +const VERSION = "2021.9.7" diff --git a/schema.yml b/schema.yml index 1097629c9..22a7c5aec 100644 --- a/schema.yml +++ b/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: authentik - version: 2021.9.6 + version: 2021.9.7 description: Making authentication simple. contact: email: hello@beryju.org diff --git a/web/src/constants.ts b/web/src/constants.ts index 965acd582..032d16599 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.9.6"; +export const VERSION = "2021.9.7"; export const PAGE_SIZE = 20; export const TITLE_DEFAULT = "authentik"; export const ROUTE_SEPARATOR = ";"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index 50d7402ee..9d3bc10a2 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -12,9 +12,9 @@ This installation method is for test-setups and small-scale productive setups. ## Preparation -Download the latest `docker-compose.yml` from [here](https://raw.githubusercontent.com/goauthentik/authentik/version/2021.9.6/docker-compose.yml). Place it in a directory of your choice. +Download the latest `docker-compose.yml` from [here](https://raw.githubusercontent.com/goauthentik/authentik/version/2021.9.7/docker-compose.yml). Place it in a directory of your choice. -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.9.6 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.9.7 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index 767e5d8a2..014a4eb75 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -13,7 +13,7 @@ version: "3.5" services: authentik_proxy: - image: ghcr.io/goauthentik/proxy:2021.9.6 + image: ghcr.io/goauthentik/proxy:2021.9.7 # Optionally specify which networks the container should be # might be needed to reach the core authentik server # networks: @@ -40,7 +40,7 @@ version: "3.5" services: authentik_ldap: - image: ghcr.io/goauthentik/ldap:2021.9.6 + image: ghcr.io/goauthentik/ldap:2021.9.7 # Optionally specify which networks the container should be # might be needed to reach the core authentik server # networks: diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index 11f4fc919..0b49e2e8d 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.6 + app.kubernetes.io/version: 2021.9.7 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.6 + app.kubernetes.io/version: 2021.9.7 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.6 + app.kubernetes.io/version: 2021.9.7 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.6 + app.kubernetes.io/version: 2021.9.7 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.6 + app.kubernetes.io/version: 2021.9.7 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: ghcr.io/goauthentik/proxy:2021.9.6 + image: ghcr.io/goauthentik/proxy:2021.9.7 name: proxy ports: - containerPort: 9000 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.6 + app.kubernetes.io/version: 2021.9.7 name: authentik-outpost spec: rules: