From e95b9da586dfe4186fe4371f081b609766e4a3cd Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 9 Jun 2021 11:07:02 +0200 Subject: [PATCH 1/4] website/docs: fix beta instructions for k8s Signed-off-by: Jens Langhammer --- website/docs/installation/beta.mdx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/installation/beta.mdx b/website/docs/installation/beta.mdx index ec64ba8e02..8f6f63b4ab 100644 --- a/website/docs/installation/beta.mdx +++ b/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 From 6291834573dcf0a69b835525f832f4584450feed Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 9 Jun 2021 11:22:28 +0200 Subject: [PATCH 2/4] outpost: fix missing outpost images Signed-off-by: Jens Langhammer --- outpost/azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/outpost/azure-pipelines.yml b/outpost/azure-pipelines.yml index 7267e1acda..ce79cec3b5 100644 --- a/outpost/azure-pipelines.yml +++ b/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) From c5cc8842ec44f0aa4c59870b090a20b976ce0ef3 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 9 Jun 2021 14:22:32 +0200 Subject: [PATCH 3/4] root: fix missing test files in docker file Signed-off-by: Jens Langhammer --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c960236747..328bb52706 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From 560c979d267907f15188b09d2aa2ff184f6d1df6 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 9 Jun 2021 14:22:45 +0200 Subject: [PATCH 4/4] root: fix requirements-dev including all dependencies Signed-off-by: Jens Langhammer --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 328bb52706..95e2617976 100644 --- a/Dockerfile +++ b/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