Merge branch 'next' into version-2021.5

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

# Conflicts:
#	outpost/pkg/version.go

outpost/pkg/version.go

@@ -1,3 +1,16 @@
 package pkg
 
+import (
+	"fmt"
+	"os"
+)
+
 const VERSION = "2021.5.1-rc8"
+
+func BUILD() string {
+	return os.Getenv("GIT_BUILD_HASH")
+}
+
+func UserAgent() string {
+	return fmt.Sprintf("authentik-outpost@%s (%s)", VERSION, BUILD())
+}