From ac9e705455c3817e79173aa12162192248be7eb8 Mon Sep 17 00:00:00 2001
From: Bubka <858858+Bubka@users.noreply.github.com>
Date: Tue, 10 May 2022 15:34:51 +0200
Subject: [PATCH] Set empty env var with null

---
 Dockerfile                |  6 +++---
 docker/docker-compose.yml | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9024a6f5..1e75df40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -177,10 +177,10 @@ ENV \
     WEBAUTHN_NAME=2FAuth \
     # Relying Party ID. If null, the device will fill it internally.
     # See https://webauthn-doc.spomky-labs.com/pre-requisites/the-relying-party#how-to-determine-the-relying-party-id
-    WEBAUTHN_ID= \
+    WEBAUTHN_ID=null \
     # Optional image data in BASE64 (128 bytes maximum) or an image url
     # See https://webauthn-doc.spomky-labs.com/pre-requisites/the-relying-party#relying-party-icon
-    WEBAUTHN_ICON= \
+    WEBAUTHN_ICON=null \
     # Use this setting to control how user verification behave during the
     # WebAuthn authentication flow.
     #
@@ -198,7 +198,7 @@ ENV \
     # Supported:
     #   '*': to trust any proxy
     #   A comma separated IP list: The list of proxies IP to trust
-    TRUSTED_PROXIES= \
+    TRUSTED_PROXIES=null \
     # Leave the following configuration vars as is.
     # Unless you like to tinker and know what you're doing.
     BROADCAST_DRIVER=log \
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ba657202..bac0e79a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -63,21 +63,21 @@ services:
       # When using 'reverse-proxy-guard' 2FAuth only look for the dedicated headers and skip all other built-in
       # authentication checks. That means your proxy is fully responsible of the authentication process, 2FAuth will
       # trust him as long as headers are presents.
-      - AUTHENTICATION_GUARD=
+      - AUTHENTICATION_GUARD=web-guard
       # Name of the HTTP headers sent by the reverse proxy that identifies the authenticated user at proxy level.
       # Check your proxy documentation to find out how these headers are named (i.e 'REMOTE_USER', 'REMOTE_EMAIL', etc...)
       # (only relevant when AUTHENTICATION_GUARD is set to 'reverse-proxy-guard')
-      - AUTH_PROXY_HEADER_FOR_USER=
-      - AUTH_PROXY_HEADER_FOR_EMAIL=
+      - AUTH_PROXY_HEADER_FOR_USER=null
+      - AUTH_PROXY_HEADER_FOR_EMAIL=null
       # WebAuthn settings
       # Relying Party name, aka the name of the application. If null, defaults to APP_NAME
-      - WEBAUTHN_NAME=
+      - WEBAUTHN_NAME=2FAuth
       # Relying Party ID. If null, the device will fill it internally.
       # See https://webauthn-doc.spomky-labs.com/pre-requisites/the-relying-party#how-to-determine-the-relying-party-id
-      - WEBAUTHN_ID=
+      - WEBAUTHN_ID=null
       # Optional image data in BASE64 (128 bytes maximum) or an image url
       # See https://webauthn-doc.spomky-labs.com/pre-requisites/the-relying-party#relying-party-icon
-      - WEBAUTHN_ICON=
+      - WEBAUTHN_ICON=null
       # Use this setting to control how user verification behave during the
       # WebAuthn authentication flow.
       #
@@ -90,12 +90,12 @@ services:
       #   'required': Will ALWAYS ask for user verification
       #   'preferred' (default) : Will ask for user verification IF POSSIBLE
       #   'discouraged' : Will NOT ask for user verification (for example, to minimize disruption to the user interaction flow)
-      - WEBAUTHN_USER_VERIFICATION=
+      - WEBAUTHN_USER_VERIFICATION=preferred
       # Use this setting to declare trusted proxied.
       # Supported:
       #   '*': to trust any proxy
       #   A comma separated IP list: The list of proxies IP to trust
-      - TRUSTED_PROXIES=
+      - TRUSTED_PROXIES=null
       # Leave the following configuration vars as is.
       # Unless you like to tinker and know what you're doing.
       - BROADCAST_DRIVER=log