diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ef4c55843..83d806ef6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.5.1-rc4 +current_version = 2021.5.1-rc7 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 923edf71a..61af7f927 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,12 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: prepare ts api client run: | docker run --rm -v $(pwd):/local openapitools/openapi-generator-cli generate -i /local/swagger.yaml -g typescript-fetch -o /local/web/api --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 @@ -30,11 +36,11 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik:2021.5.1-rc4, + beryju/authentik:2021.5.1-rc7, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.5.1-rc4, + ghcr.io/goauthentik/server:2021.5.1-rc7, ghcr.io/goauthentik/server:latest - platforms: linux/amd64,linux/arm64,linux/arm/v8 + platforms: linux/amd64,linux/arm64 context: . build-proxy: runs-on: ubuntu-latest @@ -58,18 +64,24 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Building Docker Image uses: docker/build-push-action@v2 with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-proxy:2021.5.1-rc4, + beryju/authentik-proxy:2021.5.1-rc7, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.5.1-rc4, + ghcr.io/goauthentik/proxy:2021.5.1-rc7, ghcr.io/goauthentik/proxy:latest context: outpost/ file: outpost/proxy.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v8 + platforms: linux/amd64,linux/arm64 build-ldap: runs-on: ubuntu-latest steps: @@ -92,18 +104,24 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Building Docker Image uses: docker/build-push-action@v2 with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-ldap:2021.5.1-rc4, + beryju/authentik-ldap:2021.5.1-rc7, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.5.1-rc4, + ghcr.io/goauthentik/ldap:2021.5.1-rc7, ghcr.io/goauthentik/ldap:latest context: outpost/ file: outpost/ldap.Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v8 + platforms: linux/amd64,linux/arm64 test-release: if: ${{ github.event_name == 'release' }} needs: @@ -137,5 +155,5 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.5.1-rc4 + version: authentik@2021.5.1-rc7 environment: beryjuorg-prod diff --git a/Dockerfile b/Dockerfile index 80dc60778..f80164712 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,11 +52,12 @@ RUN apt-get update && \ curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ apt-get update && \ - apt-get install -y --no-install-recommends postgresql-client-12 postgresql-client-11 build-essential libxmlsec1-dev pkg-config libmaxminddb0 && \ - apt-get clean && \ + apt-get install -y --no-install-recommends libpq-dev postgresql-client-12 postgresql-client-11 build-essential libxmlsec1-dev pkg-config libmaxminddb0 && \ pip install -r /requirements.txt --no-cache-dir && \ apt-get remove --purge -y build-essential && \ apt-get autoremove --purge -y && \ + apt-get clean && \ + rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/ && \ # This is quite hacky, but docker has no guaranteed Group ID # we could instead check for the GID of the socket and add the user dynamically, # but then we have to drop permmissions later diff --git a/authentik/__init__.py b/authentik/__init__.py index 1346e0231..4e6c83da2 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.5.1-rc4" +__version__ = "2021.5.1-rc7" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index b0002ad61..f67df4411 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc4} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc7} restart: unless-stopped command: server environment: @@ -52,7 +52,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc4} + image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc7} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index b2cde3bce..1599a76a8 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,3 +1,3 @@ package constants -const VERSION = "2021.5.1-rc4" +const VERSION = "2021.5.1-rc7" diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go index 83b3293fa..b68db357a 100644 --- a/outpost/pkg/version.go +++ b/outpost/pkg/version.go @@ -1,3 +1,3 @@ package pkg -const VERSION = "2021.5.1-rc4" +const VERSION = "2021.5.1-rc7" diff --git a/web/nginx.conf b/web/nginx.conf index ba19b2fdd..19ec6644c 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -81,7 +81,7 @@ http { location /static/ { expires 31d; add_header Cache-Control "public, no-transform"; - add_header X-authentik-version "2021.5.1-rc4"; + add_header X-authentik-version "2021.5.1-rc7"; add_header Vary X-authentik-version; } diff --git a/web/src/constants.ts b/web/src/constants.ts index e99ecaa83..912fd288a 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.5.1-rc4"; +export const VERSION = "2021.5.1-rc7"; export const PAGE_SIZE = 20; export const EVENT_REFRESH = "ak-refresh"; export const EVENT_NOTIFICATION_TOGGLE = "ak-notification-toggle"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index b975260d1..6488ced03 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env` -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc4 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.5.1-rc7 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index b827b8357..cba7385ca 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -11,7 +11,7 @@ version: "3.5" services: authentik_proxy: - image: beryju/authentik-proxy:2021.5.1-rc4 + image: beryju/authentik-proxy:2021.5.1-rc7 ports: - 4180:4180 - 4443:4443 diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index 3e790ad5f..d77e43bae 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc4 + app.kubernetes.io/version: 2021.5.1-rc7 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc4 + app.kubernetes.io/version: 2021.5.1-rc7 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc4 + app.kubernetes.io/version: 2021.5.1-rc7 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc4 + app.kubernetes.io/version: 2021.5.1-rc7 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc4 + app.kubernetes.io/version: 2021.5.1-rc7 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: beryju/authentik-proxy:2021.5.1-rc4 + image: beryju/authentik-proxy:2021.5.1-rc7 name: proxy ports: - containerPort: 4180 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.5.1-rc4 + app.kubernetes.io/version: 2021.5.1-rc7 name: authentik-outpost spec: rules: