Merge branch 'release/4.3.0'

Author: pingers

docker-compose.osx.yml

@@ -59,7 +59,7 @@ services:
     network_mode: service:web
 
   redis:
-    image: redis:alpine
+    image: redis:6.0-alpine
     command: |
       redis-server
       --maxmemory 256m

fixtures/php/settings.php.txt

@@ -74,6 +74,20 @@ if (getenv('TRUSTED_HOST_PATTERNS')) {
  * END SHEPHERD CONFIG
  */
 
+/**
+ * START OKTA CONFIG
+ *
+ * Settings for Okta auth.
+ */
+if (getenv('UA_AUTH_CLIENT_SECRET')) {
+  $settings['ua_auth.environment'] = getenv('UA_AUTH_ENVIRONMENT');
+  $settings['ua_auth.client_id'] = getenv('UA_AUTH_CLIENT_ID');
+  $settings['ua_auth.client_secret'] = getenv('UA_AUTH_CLIENT_SECRET');
+}
+/**
+ * END OKTA CONFIG
+ */
+
 /**
  * START APP CONFIG
  *