diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 32a4668c3..00ea7a59a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.6.1-rc1 +current_version = 2021.6.1-rc2 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 c4dd6bcbf..27af3f332 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,9 +33,9 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik:2021.6.1-rc1, + beryju/authentik:2021.6.1-rc2, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.6.1-rc1, + ghcr.io/goauthentik/server:2021.6.1-rc2, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64 context: . @@ -66,9 +66,9 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-proxy:2021.6.1-rc1, + beryju/authentik-proxy:2021.6.1-rc2, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.6.1-rc1, + ghcr.io/goauthentik/proxy:2021.6.1-rc2, ghcr.io/goauthentik/proxy:latest file: outpost/proxy.Dockerfile platforms: linux/amd64,linux/arm64 @@ -99,9 +99,9 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-ldap:2021.6.1-rc1, + beryju/authentik-ldap:2021.6.1-rc2, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.6.1-rc1, + ghcr.io/goauthentik/ldap:2021.6.1-rc2, ghcr.io/goauthentik/ldap:latest file: outpost/ldap.Dockerfile platforms: linux/amd64,linux/arm64 @@ -138,5 +138,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.6.1-rc1 + version: authentik@2021.6.1-rc2 environment: beryjuorg-prod diff --git a/authentik/__init__.py b/authentik/__init__.py index c085c63a7..c4a682163 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.6.1-rc1" +__version__ = "2021.6.1-rc2" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index 75bf5a4bf..2103a259a 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-rc1} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.6.1-rc2} 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-rc1} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.6.1-rc2} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index a9aab804c..41d0d1de5 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.6.1-rc1" +const VERSION = "2021.6.1-rc2" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index 502a11520..698c39ec7 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -5,7 +5,7 @@ import ( "os" ) -const VERSION = "2021.6.1-rc1" +const VERSION = "2021.6.1-rc2" func BUILD() string { build := os.Getenv("GIT_BUILD_HASH") diff --git a/web/src/constants.ts b/web/src/constants.ts index 73bb1ce2c..722b7d324 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-rc1"; +export const VERSION = "2021.6.1-rc2"; 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 8eaf9a702..90428a0b9 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-rc1/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-rc2/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-rc1 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.6.1-rc2 >> .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 c80feb7ab..4087e9130 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-rc1 + image: ghcr.io/goauthentik/proxy:2021.6.1-rc2 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-rc1 + image: ghcr.io/goauthentik/ldap:2021.6.1-rc2 ports: - 389:3389 environment: diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index c263adf59..f70e5821d 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-rc1 + app.kubernetes.io/version: 2021.6.1-rc2 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-rc1 + app.kubernetes.io/version: 2021.6.1-rc2 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-rc1 + app.kubernetes.io/version: 2021.6.1-rc2 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-rc1 + app.kubernetes.io/version: 2021.6.1-rc2 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-rc1 + app.kubernetes.io/version: 2021.6.1-rc2 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-rc1 + image: ghcr.io/goauthentik/proxy:2021.6.1-rc2 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-rc1 + app.kubernetes.io/version: 2021.6.1-rc2 name: authentik-outpost spec: rules: