Merge branch 'master' into version-2021.6

Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /app/
 
 RUN pip install pipenv && \
     pipenv lock -r > requirements.txt && \
-    pipenv lock -rd > requirements-dev.txt
+    pipenv lock -r --dev-only > requirements-dev.txt
 
 # Stage 2: Build web API
 FROM openapitools/openapi-generator-cli as api-builder
@@ -76,6 +76,7 @@ RUN apt-get update && \
 COPY ./authentik/ /authentik
 COPY ./pyproject.toml /
 COPY ./xml /xml
+COPY ./tests /tests
 COPY ./manage.py /
 COPY ./lifecycle/ /lifecycle
 COPY --from=builder /work/authentik /authentik-proxy

outpost/azure-pipelines.yml

@@ -78,6 +78,7 @@ stages:
               tags: |
                 gh-$(branchName)
                 gh-$(branchName)-$(timestamp)
+                gh-$(Build.SourceVersion)
               arguments: '--build-arg GIT_BUILD_HASH=$(Build.SourceVersion)'
           - task: Docker@2
             inputs:
@@ -87,6 +88,7 @@ stages:
               tags: |
                 gh-$(branchName)
                 gh-$(branchName)-$(timestamp)
+                gh-$(Build.SourceVersion)
       - job: ldap_build_docker
         pool:
           vmImage: 'ubuntu-latest'
@@ -109,6 +111,7 @@ stages:
               tags: |
                 gh-$(branchName)
                 gh-$(branchName)-$(timestamp)
+                gh-$(Build.SourceVersion)
               arguments: '--build-arg GIT_BUILD_HASH=$(Build.SourceVersion)'
           - task: Docker@2
             inputs:
@@ -118,3 +121,4 @@ stages:
               tags: |
                 gh-$(branchName)
                 gh-$(branchName)-$(timestamp)
+                gh-$(Build.SourceVersion)

website/docs/installation/beta.mdx

@@ -28,9 +28,11 @@ Afterwards, run the upgrade commands from the latest releasae notes.
 Add the following block to your `values.yml` file:
 
 ```yaml
+authentik:
+  outposts:
+    docker_image_base: beryju.org/authentik/outpost-%(type)s:gh-%(build_hash)s
 image:
   name: beryju.org/authentik/server
-  name_outposts: beryju.org/authentik/outpost-%(type)s:gh-next
   tag: gh-next
   # pullPolicy: Always to ensure you always get the latest version
   pullPolicy: Always