From 8e16bb3631514df89f46a7c7d9f389d04315ca98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 3 Aug 2023 19:11:08 +0200
Subject: [PATCH] Use Ditto-UI from docker Hub in default docker-compose.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* instead of the locally served UI

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/docker/docker-compose.yml                       | 6 +++++-
 deployment/docker/nginx.conf                               | 7 +++++++
 .../ditto/policies/enforcement/AbstractEnforcerActor.java  | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
index 6364f3d68d..0842ec5081 100755
--- a/deployment/docker/docker-compose.yml
+++ b/deployment/docker/docker-compose.yml
@@ -174,6 +174,11 @@ services:
       retries: 4
       start_period: 120s
 
+  ditto-ui:
+    image: docker.io/eclipse/ditto-ui:${DITTO_VERSION:-latest}
+    mem_limit: 32m
+    restart: always
+
   swagger-ui:
     image: docker.io/swaggerapi/swagger-ui:v4.14.3
     mem_limit: 32m
@@ -198,7 +203,6 @@ services:
        - ./index.html:/etc/nginx/html/index.html:ro
        - ../../documentation/src/main/resources/images:/etc/nginx/html/images:ro
        - ../../documentation/src/main/resources/wot:/etc/nginx/html/wot:ro
-       - ../../ui:/etc/nginx/html/ui:ro
     ports:
       - "${DITTO_EXTERNAL_PORT:-8080}:80"
     depends_on:
diff --git a/deployment/docker/nginx.conf b/deployment/docker/nginx.conf
index 1efa8b9a1f..f5429c6066 100755
--- a/deployment/docker/nginx.conf
+++ b/deployment/docker/nginx.conf
@@ -141,6 +141,13 @@ http {
       proxy_set_header              X-Forwarded-User    $remote_user;
     }
 
+    # ui
+    location /ui/ {
+      proxy_pass                    http://ditto-ui:8080/;
+      proxy_http_version            1.1;
+      proxy_set_header              Host                $http_host;
+    }
+
     # swagger
     # access API doc on: /apidoc/2
     location /apidoc/ {
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractEnforcerActor.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractEnforcerActor.java
index 55b5477b62..be16c12787 100644
--- a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractEnforcerActor.java
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractEnforcerActor.java
@@ -28,8 +28,8 @@
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
 import org.eclipse.ditto.internal.utils.akka.actors.AbstractActorWithStashWithTimers;
-import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
+import org.eclipse.ditto.internal.utils.akka.logging.ThreadSafeDittoLoggingAdapter;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracing;
 import org.eclipse.ditto.internal.utils.tracing.span.SpanOperationName;
@@ -61,7 +61,7 @@ public abstract class AbstractEnforcerActor<I extends EntityId, S extends Signal
      */
     protected static final Duration DEFAULT_LOCAL_ASK_TIMEOUT = Duration.ofSeconds(5);
 
-    protected final DittoDiagnosticLoggingAdapter log = DittoLoggerFactory.getDiagnosticLoggingAdapter(this);
+    protected final ThreadSafeDittoLoggingAdapter log = DittoLoggerFactory.getThreadSafeDittoLoggingAdapter(this);
 
     protected final I entityId;
     protected final E enforcement;