Merge branch 'version-2022.7'

.bumpversion.cfg

@@ -1,9 +1,9 @@
 [bumpversion]
-current_version = 2022.6.3
+current_version = 2022.7.1
 tag = True
 commit = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
-serialize =	{major}.{minor}.{patch}
+serialize = {major}.{minor}.{patch}
 message = release: {new_version}
 tag_name = version/{new_version}
 
@@ -17,4 +17,4 @@ tag_name = version/{new_version}
 
 [bumpversion:file:internal/constants/constants.go]
 
-[bumpversion:file:web/package.json]
+[bumpversion:file:web/src/constants.ts]

authentik/__init__.py

@@ -2,7 +2,7 @@
 from os import environ
 from typing import Optional
 
-__version__ = "2022.6.3"
+__version__ = "2022.7.1"
 ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
 
 

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       retries: 5
       timeout: 3s
   server:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.6.3}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.7.1}
     restart: unless-stopped
     command: server
     environment:
@@ -50,7 +50,7 @@ services:
       - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000"
       - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443"
   worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.6.3}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.7.1}
     restart: unless-stopped
     command: worker
     environment:

internal/constants/constants.go

@@ -29,4 +29,4 @@ func UserAgent() string {
 	return fmt.Sprintf("authentik@%s", FullVersion())
 }
 
-const VERSION = "2022.6.3"
+const VERSION = "2022.7.1"

pyproject.toml

@@ -90,7 +90,7 @@ addopts = "-p no:celery --junitxml=unittest.xml"
 
 [tool.poetry]
 name = "authentik"
-version = "2022.6.3"
+version = "2022.7.1"
 description = ""
 authors = ["authentik Team <hello@goauthentik.io>"]
 

schema.yml

@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: authentik
-  version: 2022.6.3
+  version: 2022.7.1
   description: Making authentication simple.
   contact:
     email: hello@goauthentik.io

web/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@goauthentik/web",
-    "version": "2022.6.3",
+    "name": "authentik-web",
+    "version": "0.0.0",
     "private": true,
     "license": "GNU GPLv3",
     "scripts": {

web/rollup.config.js

@@ -7,8 +7,6 @@ import copy from "rollup-plugin-copy";
 import cssimport from "rollup-plugin-cssimport";
 import { terser } from "rollup-plugin-terser";
 
-import pkg from "./package.json";
-
 const extensions = [".js", ".jsx", ".ts", ".tsx"];
 
 export const resources = [
@@ -75,12 +73,6 @@ export const defaultOptions = {
     plugins: [
         cssimport(),
         markdown(),
-        replace({
-            "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
-            "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
-            "process.env.AK_VERSION": JSON.stringify(pkg.version),
-            "preventAssignment": true,
-        }),
         nodeResolve({ extensions, browser: true }),
         commonjs(),
         babel({
@@ -88,6 +80,11 @@ export const defaultOptions = {
             babelHelpers: "runtime",
             include: ["src/**/*"],
         }),
+        replace({
+            "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
+            "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
+            "preventAssignment": true,
+        }),
         isProdBuild && terser(),
     ].filter((p) => p),
     watch: {

web/src/constants.ts

@@ -1,11 +1,9 @@
-// Placeholder, replaced by rollup;
-export const VERSION = process.env.AK_VERSION;
-
 export const SECONDARY_CLASS = "pf-m-secondary";
 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 = "2022.7.1";
 export const TITLE_DEFAULT = "authentik";
 export const ROUTE_SEPARATOR = ";";