Merge branch 'version-2021.7'
This commit is contained in:
		@ -1,5 +1,5 @@
 | 
				
			|||||||
[bumpversion]
 | 
					[bumpversion]
 | 
				
			||||||
current_version = 2021.7.1-rc1
 | 
					current_version = 2021.7.1-rc2
 | 
				
			||||||
tag = True
 | 
					tag = True
 | 
				
			||||||
commit = True
 | 
					commit = True
 | 
				
			||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-?(?P<release>.*)
 | 
					parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-?(?P<release>.*)
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										20
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@ -33,14 +33,14 @@ jobs:
 | 
				
			|||||||
        with:
 | 
					        with:
 | 
				
			||||||
          push: ${{ github.event_name == 'release' }}
 | 
					          push: ${{ github.event_name == 'release' }}
 | 
				
			||||||
          tags: |
 | 
					          tags: |
 | 
				
			||||||
            beryju/authentik:2021.7.1-rc1,
 | 
					            beryju/authentik:2021.7.1-rc2,
 | 
				
			||||||
            beryju/authentik:latest,
 | 
					            beryju/authentik:latest,
 | 
				
			||||||
            ghcr.io/goauthentik/server:2021.7.1-rc1,
 | 
					            ghcr.io/goauthentik/server:2021.7.1-rc2,
 | 
				
			||||||
            ghcr.io/goauthentik/server:latest
 | 
					            ghcr.io/goauthentik/server:latest
 | 
				
			||||||
          platforms: linux/amd64,linux/arm64
 | 
					          platforms: linux/amd64,linux/arm64
 | 
				
			||||||
          context: .
 | 
					          context: .
 | 
				
			||||||
      - name: Building Docker Image (stable)
 | 
					      - name: Building Docker Image (stable)
 | 
				
			||||||
        if: ${{ github.event_name == 'release' && !contains('2021.7.1-rc1', 'rc') }}
 | 
					        if: ${{ github.event_name == 'release' && !contains('2021.7.1-rc2', 'rc') }}
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          docker pull beryju/authentik:latest
 | 
					          docker pull beryju/authentik:latest
 | 
				
			||||||
          docker tag beryju/authentik:latest beryju/authentik:stable
 | 
					          docker tag beryju/authentik:latest beryju/authentik:stable
 | 
				
			||||||
@ -75,14 +75,14 @@ jobs:
 | 
				
			|||||||
        with:
 | 
					        with:
 | 
				
			||||||
          push: ${{ github.event_name == 'release' }}
 | 
					          push: ${{ github.event_name == 'release' }}
 | 
				
			||||||
          tags: |
 | 
					          tags: |
 | 
				
			||||||
            beryju/authentik-proxy:2021.7.1-rc1,
 | 
					            beryju/authentik-proxy:2021.7.1-rc2,
 | 
				
			||||||
            beryju/authentik-proxy:latest,
 | 
					            beryju/authentik-proxy:latest,
 | 
				
			||||||
            ghcr.io/goauthentik/proxy:2021.7.1-rc1,
 | 
					            ghcr.io/goauthentik/proxy:2021.7.1-rc2,
 | 
				
			||||||
            ghcr.io/goauthentik/proxy:latest
 | 
					            ghcr.io/goauthentik/proxy:latest
 | 
				
			||||||
          file: proxy.Dockerfile
 | 
					          file: proxy.Dockerfile
 | 
				
			||||||
          platforms: linux/amd64,linux/arm64
 | 
					          platforms: linux/amd64,linux/arm64
 | 
				
			||||||
      - name: Building Docker Image (stable)
 | 
					      - name: Building Docker Image (stable)
 | 
				
			||||||
        if: ${{ github.event_name == 'release' && !contains('2021.7.1-rc1', 'rc') }}
 | 
					        if: ${{ github.event_name == 'release' && !contains('2021.7.1-rc2', 'rc') }}
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          docker pull beryju/authentik-proxy:latest
 | 
					          docker pull beryju/authentik-proxy:latest
 | 
				
			||||||
          docker tag beryju/authentik-proxy:latest beryju/authentik-proxy:stable
 | 
					          docker tag beryju/authentik-proxy:latest beryju/authentik-proxy:stable
 | 
				
			||||||
@ -117,14 +117,14 @@ jobs:
 | 
				
			|||||||
        with:
 | 
					        with:
 | 
				
			||||||
          push: ${{ github.event_name == 'release' }}
 | 
					          push: ${{ github.event_name == 'release' }}
 | 
				
			||||||
          tags: |
 | 
					          tags: |
 | 
				
			||||||
            beryju/authentik-ldap:2021.7.1-rc1,
 | 
					            beryju/authentik-ldap:2021.7.1-rc2,
 | 
				
			||||||
            beryju/authentik-ldap:latest,
 | 
					            beryju/authentik-ldap:latest,
 | 
				
			||||||
            ghcr.io/goauthentik/ldap:2021.7.1-rc1,
 | 
					            ghcr.io/goauthentik/ldap:2021.7.1-rc2,
 | 
				
			||||||
            ghcr.io/goauthentik/ldap:latest
 | 
					            ghcr.io/goauthentik/ldap:latest
 | 
				
			||||||
          file: ldap.Dockerfile
 | 
					          file: ldap.Dockerfile
 | 
				
			||||||
          platforms: linux/amd64,linux/arm64
 | 
					          platforms: linux/amd64,linux/arm64
 | 
				
			||||||
      - name: Building Docker Image (stable)
 | 
					      - name: Building Docker Image (stable)
 | 
				
			||||||
        if: ${{ github.event_name == 'release' && !contains('2021.7.1-rc1', 'rc') }}
 | 
					        if: ${{ github.event_name == 'release' && !contains('2021.7.1-rc2', 'rc') }}
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          docker pull beryju/authentik-ldap:latest
 | 
					          docker pull beryju/authentik-ldap:latest
 | 
				
			||||||
          docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable
 | 
					          docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable
 | 
				
			||||||
@ -176,7 +176,7 @@ jobs:
 | 
				
			|||||||
          SENTRY_PROJECT: authentik
 | 
					          SENTRY_PROJECT: authentik
 | 
				
			||||||
          SENTRY_URL: https://sentry.beryju.org
 | 
					          SENTRY_URL: https://sentry.beryju.org
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          version: authentik@2021.7.1-rc1
 | 
					          version: authentik@2021.7.1-rc2
 | 
				
			||||||
          environment: beryjuorg-prod
 | 
					          environment: beryjuorg-prod
 | 
				
			||||||
          sourcemaps: './web/dist'
 | 
					          sourcemaps: './web/dist'
 | 
				
			||||||
          url_prefix: /static/dist
 | 
					          url_prefix: /static/dist
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,3 @@
 | 
				
			|||||||
"""authentik"""
 | 
					"""authentik"""
 | 
				
			||||||
__version__ = "2021.7.1-rc1"
 | 
					__version__ = "2021.7.1-rc2"
 | 
				
			||||||
ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
 | 
					ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
 | 
				
			||||||
 | 
				
			|||||||
@ -21,7 +21,7 @@ services:
 | 
				
			|||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - internal
 | 
					      - internal
 | 
				
			||||||
  server:
 | 
					  server:
 | 
				
			||||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.7.1-rc1}
 | 
					    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.7.1-rc2}
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    command: server
 | 
					    command: server
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
@ -44,7 +44,7 @@ services:
 | 
				
			|||||||
      - "0.0.0.0:9000:9000"
 | 
					      - "0.0.0.0:9000:9000"
 | 
				
			||||||
      - "0.0.0.0:9443:9443"
 | 
					      - "0.0.0.0:9443:9443"
 | 
				
			||||||
  worker:
 | 
					  worker:
 | 
				
			||||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.7.1-rc1}
 | 
					    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.7.1-rc2}
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    command: worker
 | 
					    command: worker
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
 | 
				
			|||||||
@ -17,4 +17,4 @@ func OutpostUserAgent() string {
 | 
				
			|||||||
	return fmt.Sprintf("authentik-outpost@%s (%s)", VERSION, BUILD())
 | 
						return fmt.Sprintf("authentik-outpost@%s (%s)", VERSION, BUILD())
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const VERSION = "2021.7.1-rc1"
 | 
					const VERSION = "2021.7.1-rc2"
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
openapi: 3.0.3
 | 
					openapi: 3.0.3
 | 
				
			||||||
info:
 | 
					info:
 | 
				
			||||||
  title: authentik
 | 
					  title: authentik
 | 
				
			||||||
  version: 2021.7.1-rc1
 | 
					  version: 2021.7.1-rc2
 | 
				
			||||||
  description: Making authentication simple.
 | 
					  description: Making authentication simple.
 | 
				
			||||||
  contact:
 | 
					  contact:
 | 
				
			||||||
    email: hello@beryju.org
 | 
					    email: hello@beryju.org
 | 
				
			||||||
 | 
				
			|||||||
@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success";
 | 
				
			|||||||
export const ERROR_CLASS = "pf-m-danger";
 | 
					export const ERROR_CLASS = "pf-m-danger";
 | 
				
			||||||
export const PROGRESS_CLASS = "pf-m-in-progress";
 | 
					export const PROGRESS_CLASS = "pf-m-in-progress";
 | 
				
			||||||
export const CURRENT_CLASS = "pf-m-current";
 | 
					export const CURRENT_CLASS = "pf-m-current";
 | 
				
			||||||
export const VERSION = "2021.7.1-rc1";
 | 
					export const VERSION = "2021.7.1-rc2";
 | 
				
			||||||
export const PAGE_SIZE = 20;
 | 
					export const PAGE_SIZE = 20;
 | 
				
			||||||
export const TITLE_DEFAULT = "authentik";
 | 
					export const TITLE_DEFAULT = "authentik";
 | 
				
			||||||
export const ROUTE_SEPARATOR = ";";
 | 
					export const ROUTE_SEPARATOR = ";";
 | 
				
			||||||
 | 
				
			|||||||
@ -12,11 +12,11 @@ This installation method is for test-setups and small-scale productive setups.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
## Preparation
 | 
					## Preparation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Download the latest `docker-compose.yml` from [here](https://raw.githubusercontent.com/goauthentik/authentik/version/2021.7.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.7.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 enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.7.1-rc1 >> .env`
 | 
					To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.7.1-rc2 >> .env`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
If this is a fresh authentik install run the following commands to generate a password:
 | 
					If this is a fresh authentik install run the following commands to generate a password:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -11,7 +11,7 @@ version: "3.5"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  authentik_proxy:
 | 
					  authentik_proxy:
 | 
				
			||||||
    image: ghcr.io/goauthentik/proxy:2021.7.1-rc1
 | 
					    image: ghcr.io/goauthentik/proxy:2021.7.1-rc2
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - 4180:4180
 | 
					      - 4180:4180
 | 
				
			||||||
      - 4443:4443
 | 
					      - 4443:4443
 | 
				
			||||||
@ -21,7 +21,7 @@ services:
 | 
				
			|||||||
      AUTHENTIK_TOKEN: token-generated-by-authentik
 | 
					      AUTHENTIK_TOKEN: token-generated-by-authentik
 | 
				
			||||||
  # Or, for the LDAP Outpost
 | 
					  # Or, for the LDAP Outpost
 | 
				
			||||||
  authentik_proxy:
 | 
					  authentik_proxy:
 | 
				
			||||||
    image: ghcr.io/goauthentik/ldap:2021.7.1-rc1
 | 
					    image: ghcr.io/goauthentik/ldap:2021.7.1-rc2
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - 389:3389
 | 
					      - 389:3389
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
 | 
				
			|||||||
@ -14,7 +14,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
					    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
				
			||||||
    app.kubernetes.io/managed-by: goauthentik.io
 | 
					    app.kubernetes.io/managed-by: goauthentik.io
 | 
				
			||||||
    app.kubernetes.io/name: authentik-proxy
 | 
					    app.kubernetes.io/name: authentik-proxy
 | 
				
			||||||
    app.kubernetes.io/version: 2021.7.1-rc1
 | 
					    app.kubernetes.io/version: 2021.7.1-rc2
 | 
				
			||||||
  name: authentik-outpost-api
 | 
					  name: authentik-outpost-api
 | 
				
			||||||
stringData:
 | 
					stringData:
 | 
				
			||||||
  authentik_host: "__AUTHENTIK_URL__"
 | 
					  authentik_host: "__AUTHENTIK_URL__"
 | 
				
			||||||
@ -29,7 +29,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
					    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
				
			||||||
    app.kubernetes.io/managed-by: goauthentik.io
 | 
					    app.kubernetes.io/managed-by: goauthentik.io
 | 
				
			||||||
    app.kubernetes.io/name: authentik-proxy
 | 
					    app.kubernetes.io/name: authentik-proxy
 | 
				
			||||||
    app.kubernetes.io/version: 2021.7.1-rc1
 | 
					    app.kubernetes.io/version: 2021.7.1-rc2
 | 
				
			||||||
  name: authentik-outpost
 | 
					  name: authentik-outpost
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  ports:
 | 
					  ports:
 | 
				
			||||||
@ -54,7 +54,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
					    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
				
			||||||
    app.kubernetes.io/managed-by: goauthentik.io
 | 
					    app.kubernetes.io/managed-by: goauthentik.io
 | 
				
			||||||
    app.kubernetes.io/name: authentik-proxy
 | 
					    app.kubernetes.io/name: authentik-proxy
 | 
				
			||||||
    app.kubernetes.io/version: 2021.7.1-rc1
 | 
					    app.kubernetes.io/version: 2021.7.1-rc2
 | 
				
			||||||
  name: authentik-outpost
 | 
					  name: authentik-outpost
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  selector:
 | 
					  selector:
 | 
				
			||||||
@ -62,14 +62,14 @@ spec:
 | 
				
			|||||||
      app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
					      app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
				
			||||||
      app.kubernetes.io/managed-by: goauthentik.io
 | 
					      app.kubernetes.io/managed-by: goauthentik.io
 | 
				
			||||||
      app.kubernetes.io/name: authentik-proxy
 | 
					      app.kubernetes.io/name: authentik-proxy
 | 
				
			||||||
      app.kubernetes.io/version: 2021.7.1-rc1
 | 
					      app.kubernetes.io/version: 2021.7.1-rc2
 | 
				
			||||||
  template:
 | 
					  template:
 | 
				
			||||||
    metadata:
 | 
					    metadata:
 | 
				
			||||||
      labels:
 | 
					      labels:
 | 
				
			||||||
        app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
					        app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
				
			||||||
        app.kubernetes.io/managed-by: goauthentik.io
 | 
					        app.kubernetes.io/managed-by: goauthentik.io
 | 
				
			||||||
        app.kubernetes.io/name: authentik-proxy
 | 
					        app.kubernetes.io/name: authentik-proxy
 | 
				
			||||||
        app.kubernetes.io/version: 2021.7.1-rc1
 | 
					        app.kubernetes.io/version: 2021.7.1-rc2
 | 
				
			||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - env:
 | 
					        - env:
 | 
				
			||||||
@ -88,7 +88,7 @@ spec:
 | 
				
			|||||||
              secretKeyRef:
 | 
					              secretKeyRef:
 | 
				
			||||||
                key: authentik_host_insecure
 | 
					                key: authentik_host_insecure
 | 
				
			||||||
                name: authentik-outpost-api
 | 
					                name: authentik-outpost-api
 | 
				
			||||||
        image: ghcr.io/goauthentik/proxy:2021.7.1-rc1
 | 
					        image: ghcr.io/goauthentik/proxy:2021.7.1-rc2
 | 
				
			||||||
        name: proxy
 | 
					        name: proxy
 | 
				
			||||||
        ports:
 | 
					        ports:
 | 
				
			||||||
          - containerPort: 4180
 | 
					          - containerPort: 4180
 | 
				
			||||||
@ -110,7 +110,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
					    app.kubernetes.io/instance: __OUTPOST_NAME__
 | 
				
			||||||
    app.kubernetes.io/managed-by: goauthentik.io
 | 
					    app.kubernetes.io/managed-by: goauthentik.io
 | 
				
			||||||
    app.kubernetes.io/name: authentik-proxy
 | 
					    app.kubernetes.io/name: authentik-proxy
 | 
				
			||||||
    app.kubernetes.io/version: 2021.7.1-rc1
 | 
					    app.kubernetes.io/version: 2021.7.1-rc2
 | 
				
			||||||
  name: authentik-outpost
 | 
					  name: authentik-outpost
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  rules:
 | 
					  rules:
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user