trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into version-2021.6

Browse source
This commit is contained in:
Jens Langhammer 2021-06-09 15:04:52 +02:00
parent f4a53c89ef 560c979d26
commit c81431895a
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

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

4
outpost/azure-pipelines.yml
View file

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

4
website/docs/installation/beta.mdx
View file

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