website: copy static files instead of linking them to prevent cache issues

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

web/src/admin/stages/user_write/UserWriteStageForm.ts

@@ -66,9 +66,7 @@ export class UserWriteStageForm extends ModelForm<UserWriteStage, string> {
                                 class="pf-c-check__input"
                                 ?checked=${first(this.instance?.canCreateUsers, false)}
                             />
-                            <label class="pf-c-check__label">
-                                ${t`Can create users`}
-                            </label>
+                            <label class="pf-c-check__label"> ${t`Can create users`} </label>
                         </div>
                         <p class="pf-c-form__helper-text">
                             ${t`When enabled, this stage has the ability to create new users. If no user is available in the flow with this disabled, the stage will fail.`}

website/.gitignore

@@ -19,3 +19,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+static/docker-compose.yml
+static/schema.yaml

website/developer-docs/releases/index.md

@@ -152,7 +152,7 @@ Subject: `Release of authentik Security releases 2022.10.3 and 2022.11.3`
 ```markdown
 The security advisory for CVE-2022-xxxxx has been published: https://github.com/goauthentik/authentik/security/advisories/GHSA-mjfw-54m5-fvjf
 
-Releases with fixes are being built and will be available here: https://github.com/goauthentik/authentik/releases
+Releases 2022.10.3 and 2022.11.3 with fixes included are available here: https://github.com/goauthentik/authentik/releases
 ```
 
 </p>
@@ -164,7 +164,11 @@ Releases with fixes are being built and will be available here: https://github.c
 ```markdown
 [...existing announcement...]
 
-Edit: Advisory for for CVE-2022-xxxxx has been published here https://github.com/goauthentik/authentik/security/advisories/GHSA-mjfw-54m5-fvjf, the fixed versions are currently building and will be available here: https://github.com/goauthentik/authentik/releases
+Edit:
+
+Advisory for for CVE-2022-xxxxx has been published here https://github.com/goauthentik/authentik/security/advisories/GHSA-mjfw-54m5-fvjf
+
+The fixed versions 2022.10.3 and 2022.11.3 are available here: https://github.com/goauthentik/authentik/releases
 ```
 
 </p>

website/package.json

@@ -6,7 +6,7 @@
     "scripts": {
         "docusaurus": "docusaurus",
         "watch": "docusaurus start",
-        "build": "docusaurus build",
+        "build": "cp ../docker-compose.yml static/docker-compose.yml && cp ../schema.yml static/schema.yaml && docusaurus build",
         "build-docs-only": "docusaurus build --config docusaurus.docs-only.js --out-dir help",
         "swizzle": "docusaurus swizzle",
         "deploy": "docusaurus deploy",

website/static/docker-compose.yml

@@ -1 +0,0 @@
-../../docker-compose.yml

website/static/docker-compose.yml

@@ -0,0 +1,81 @@
+---
+version: '3.4'
+
+services:
+  postgresql:
+    image: docker.io/library/postgres:12-alpine
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+      start_period: 20s
+      interval: 30s
+      retries: 5
+      timeout: 5s
+    volumes:
+      - database:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=${PG_PASS:?database password required}
+      - POSTGRES_USER=${PG_USER:-authentik}
+      - POSTGRES_DB=${PG_DB:-authentik}
+    env_file:
+      - .env
+  redis:
+    image: docker.io/library/redis:alpine
+    command: --save 60 1 --loglevel warning
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
+      start_period: 20s
+      interval: 30s
+      retries: 5
+      timeout: 3s
+    volumes:
+      - redis:/data
+  server:
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.11.4}
+    restart: unless-stopped
+    command: server
+    environment:
+      AUTHENTIK_REDIS__HOST: redis
+      AUTHENTIK_POSTGRESQL__HOST: postgresql
+      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
+      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
+      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
+    volumes:
+      - ./media:/media
+      - ./custom-templates:/templates
+    env_file:
+      - .env
+    ports:
+      - "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.11.4}
+    restart: unless-stopped
+    command: worker
+    environment:
+      AUTHENTIK_REDIS__HOST: redis
+      AUTHENTIK_POSTGRESQL__HOST: postgresql
+      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
+      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
+      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
+    # `user: root` and the docker socket volume are optional.
+    # See more for the docker socket integration here:
+    # https://goauthentik.io/docs/outposts/integrations/docker
+    # Removing `user: root` also prevents the worker from fixing the permissions
+    # on the mounted folders, so when removing this make sure the folders have the correct UID/GID
+    # (1000:1000 by default)
+    user: root
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./media:/media
+      - ./certs:/certs
+      - ./custom-templates:/templates
+    env_file:
+      - .env
+
+volumes:
+  database:
+    driver: local
+  redis:
+    driver: local

website/static/schema.yaml

@@ -1 +0,0 @@
-../../schema.yml