habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into inbuilt-proxy

Browse Source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	internal/constants/constants.go
#	outpost/pkg/version.go
This commit is contained in:
Jens Langhammer
2021-07-02 16:23:30 +02:00
parent 2a0bd50e23 02dd44eeec
commit 3dc9e247d5
42 changed files with 481 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/release.yml vendored
View File

@ -33,14 +33,14 @@ jobs:
with:
push: ${{ github.event_name == 'release' }}
tags: |
beryju/authentik:2021.6.2,
beryju/authentik:2021.6.3,
beryju/authentik:latest,
ghcr.io/goauthentik/server:2021.6.2,
ghcr.io/goauthentik/server:2021.6.3,
ghcr.io/goauthentik/server:latest
platforms: linux/amd64,linux/arm64
context: .
- name: Building Docker Image (stable)
if: ${{ github.event_name == 'release' && !contains('2021.6.2', 'rc') }}
if: ${{ github.event_name == 'release' && !contains('2021.6.3', 'rc') }}
run: |
docker pull beryju/authentik:latest
docker tag beryju/authentik:latest beryju/authentik:stable
@ -75,14 +75,14 @@ jobs:
with:
push: ${{ github.event_name == 'release' }}
tags: |
beryju/authentik-proxy:2021.6.2,
beryju/authentik-proxy:2021.6.3,
beryju/authentik-proxy:latest,
ghcr.io/goauthentik/proxy:2021.6.2,
ghcr.io/goauthentik/proxy:2021.6.3,
ghcr.io/goauthentik/proxy:latest
file: proxy.Dockerfile
platforms: linux/amd64,linux/arm64
- name: Building Docker Image (stable)
if: ${{ github.event_name == 'release' && !contains('2021.6.2', 'rc') }}
if: ${{ github.event_name == 'release' && !contains('2021.6.3', 'rc') }}
run: |
docker pull beryju/authentik-proxy:latest
docker tag beryju/authentik-proxy:latest beryju/authentik-proxy:stable
@ -117,14 +117,14 @@ jobs:
with:
push: ${{ github.event_name == 'release' }}
tags: |
beryju/authentik-ldap:2021.6.2,
beryju/authentik-ldap:2021.6.3,
beryju/authentik-ldap:latest,
ghcr.io/goauthentik/ldap:2021.6.2,
ghcr.io/goauthentik/ldap:2021.6.3,
ghcr.io/goauthentik/ldap:latest
file: ldap.Dockerfile
platforms: linux/amd64,linux/arm64
- name: Building Docker Image (stable)
if: ${{ github.event_name == 'release' && !contains('2021.6.2', 'rc') }}
if: ${{ github.event_name == 'release' && !contains('2021.6.3', 'rc') }}
run: |
docker pull beryju/authentik-ldap:latest
docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable
@ -157,7 +157,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup Node.js environment
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2.2.0
with:
node-version: 12.x
- name: Build web api client and web ui
@ -176,6 +176,7 @@ jobs:
SENTRY_PROJECT: authentik
SENTRY_URL: https://sentry.beryju.org
with:
version: authentik@2021.6.2
version: authentik@2021.6.3
environment: beryjuorg-prod
sourcemaps: './web/dist'
finalize: false