From fe6963c42823b9e1178ae3db99c88df3c466c061 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 17 Jun 2021 22:14:52 +0200 Subject: [PATCH] release: 2021.6.1 --- .bumpversion.cfg | 2 +- .github/workflows/release.yml | 20 +++++++++---------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- outpost/pkg/version.go | 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 dcc09ed28..dc7733656 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.6.1-rc6 +current_version = 2021.6.1 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 988aa397a..84f67e36b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,15 +33,15 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik:2021.6.1-rc6, + beryju/authentik:2021.6.1, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.6.1-rc6, + ghcr.io/goauthentik/server:2021.6.1, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64 context: . - name: Building Docker Image (stable) uses: docker/build-push-action@v2 - if: ${{ github.event_name == 'release' && !contains('2021.6.1-rc6', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.6.1', 'rc') }} with: push: true tags: | @@ -76,15 +76,15 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-proxy:2021.6.1-rc6, + beryju/authentik-proxy:2021.6.1, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.6.1-rc6, + ghcr.io/goauthentik/proxy:2021.6.1, ghcr.io/goauthentik/proxy:latest file: outpost/proxy.Dockerfile platforms: linux/amd64,linux/arm64 - name: Building Docker Image (stable) uses: docker/build-push-action@v2 - if: ${{ github.event_name == 'release' && !contains('2021.6.1-rc6', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.6.1', 'rc') }} with: push: true tags: | @@ -119,15 +119,15 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-ldap:2021.6.1-rc6, + beryju/authentik-ldap:2021.6.1, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.6.1-rc6, + ghcr.io/goauthentik/ldap:2021.6.1, ghcr.io/goauthentik/ldap:latest file: outpost/ldap.Dockerfile platforms: linux/amd64,linux/arm64 - name: Building Docker Image (stable) uses: docker/build-push-action@v2 - if: ${{ github.event_name == 'release' && !contains('2021.6.1-rc6', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.6.1', 'rc') }} with: push: true tags: | @@ -168,5 +168,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.6.1-rc6 + version: authentik@2021.6.1 environment: beryjuorg-prod diff --git a/authentik/__init__.py b/authentik/__init__.py index 18b50e8bb..a1441c72f 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.6.1-rc6" +__version__ = "2021.6.1" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index a005cfe5a..04292c919 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.6.1-rc6} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.6.1} restart: unless-stopped command: server environment: @@ -52,7 +52,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.6.1-rc6} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.6.1} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 493c21ea2..9707afadd 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.6.1-rc6" +const VERSION = "2021.6.1" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index d3f886517..7c32c942b 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -5,7 +5,7 @@ import ( "os" ) -const VERSION = "2021.6.1-rc6" +const VERSION = "2021.6.1" func BUILD() string { build := os.Getenv("GIT_BUILD_HASH") diff --git a/web/src/constants.ts b/web/src/constants.ts index cb7a06fd5..b1af40459 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.6.1-rc6"; +export const VERSION = "2021.6.1"; export const PAGE_SIZE = 20; export const EVENT_REFRESH = "ak-refresh"; export const EVENT_NOTIFICATION_TOGGLE = "ak-notification-toggle"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index 3476adad3..0421768f7 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -12,11 +12,11 @@ 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.6.1-rc6/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.6.1/docker-compose.yml). Place it in a directory of your choice. To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env` -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.6.1-rc6 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.6.1 >> .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 c70082a65..4bffc4d32 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: ghcr.io/goauthentik/proxy:2021.6.1-rc6 + image: ghcr.io/goauthentik/proxy:2021.6.1 ports: - 4180:4180 - 4443:4443 @@ -21,7 +21,7 @@ services: AUTHENTIK_TOKEN: token-generated-by-authentik # Or, for the LDAP Outpost authentik_proxy: - image: ghcr.io/goauthentik/ldap:2021.6.1-rc6 + image: ghcr.io/goauthentik/ldap:2021.6.1 ports: - 389:3389 environment: diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index e36d3c79e..eaf6fcf88 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.6.1-rc6 + app.kubernetes.io/version: 2021.6.1 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.6.1-rc6 + app.kubernetes.io/version: 2021.6.1 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.6.1-rc6 + app.kubernetes.io/version: 2021.6.1 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.6.1-rc6 + app.kubernetes.io/version: 2021.6.1 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.6.1-rc6 + app.kubernetes.io/version: 2021.6.1 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: ghcr.io/goauthentik/proxy:2021.6.1-rc6 + image: ghcr.io/goauthentik/proxy:2021.6.1 name: proxy ports: - containerPort: 4180 @@ -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.6.1-rc6 + app.kubernetes.io/version: 2021.6.1 name: authentik-outpost spec: rules: