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

Merge branch 'master' into publish-api-to-npm

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

# Conflicts:
#	web/package-lock.json
#	web/src/pages/sources/oauth/OAuthSourceForm.ts
This commit is contained in:
Jens Langhammer
2021-08-23 09:32:04 +02:00
parent bd9cd086a0 f95a7c26e5
commit b74681f22c
74 changed files with 4022 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,14 +33,14 @@ jobs:
with:
push: ${{ github.event_name == 'release' }}
tags: |
beryju/authentik:2021.7.3,
beryju/authentik:2021.8.1-rc1,
beryju/authentik:latest,
ghcr.io/goauthentik/server:2021.7.3,
ghcr.io/goauthentik/server:2021.8.1-rc1,
ghcr.io/goauthentik/server:latest
platforms: linux/amd64,linux/arm64
context: .
- name: Building Docker Image (stable)
if: ${{ github.event_name == 'release' && !contains('2021.7.3', 'rc') }}
if: ${{ github.event_name == 'release' && !contains('2021.8.1-rc1', '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.7.3,
beryju/authentik-proxy:2021.8.1-rc1,
beryju/authentik-proxy:latest,
ghcr.io/goauthentik/proxy:2021.7.3,
ghcr.io/goauthentik/proxy:2021.8.1-rc1,
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.7.3', 'rc') }}
if: ${{ github.event_name == 'release' && !contains('2021.8.1-rc1', '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.7.3,
beryju/authentik-ldap:2021.8.1-rc1,
beryju/authentik-ldap:latest,
ghcr.io/goauthentik/ldap:2021.7.3,
ghcr.io/goauthentik/ldap:2021.8.1-rc1,
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.7.3', 'rc') }}
if: ${{ github.event_name == 'release' && !contains('2021.8.1-rc1', 'rc') }}
run: |
docker pull beryju/authentik-ldap:latest
docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable
@ -175,7 +175,7 @@ jobs:
SENTRY_PROJECT: authentik
SENTRY_URL: https://sentry.beryju.org
with:
version: authentik@2021.7.3
version: authentik@2021.8.1-rc1
environment: beryjuorg-prod
sourcemaps: './web/dist'
url_prefix: '~/static/dist'

2
.github/workflows/tag.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
docker-compose run -u root server test
- name: Extract version number
id: get_version
uses: actions/github-script@v4.0.2
uses: actions/github-script@v4.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |

2
.github/workflows/web-api-publish.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'
- run: make gen-web
- run: |