From 2d4585d086c84e355b5f062f380aaf33e199d3fb Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <themaxx76@gmail.com>
Date: Fri, 23 Apr 2021 18:53:41 +0200
Subject: [PATCH] Commented out journald logging driver, the default will be
 used. The docker image for conductor is the local and not the public on the
 hub (for the moment for dev purposes). Oauth2 strategy is used for the login.

---
 local-site/conductor.yaml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/local-site/conductor.yaml b/local-site/conductor.yaml
index bc1b03d..3f99f74 100644
--- a/local-site/conductor.yaml
+++ b/local-site/conductor.yaml
@@ -34,8 +34,8 @@ services:
       - source: swarm-config
         target: /app/config/conductor-swarm-config.properties
 
-    logging:
-      driver: "journald"
+#    logging:
+#      driver: "journald"
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:5.6.8
@@ -48,8 +48,8 @@ services:
       conductor-network:
         aliases:
           - es
-    logging:
-      driver: "journald"
+#    logging:
+#      driver: "journald"
     deploy:
       mode: replicated
       replicas: 1
@@ -64,7 +64,8 @@ services:
       - WF_SERVER=http://conductor-server:8080/api/
       - AUTH_CONFIG_PATH=/app/config/auth.config
     #image: nubisware/conductor-ui
-    image: nubisware/conductor-ui_oauth2:2.31
+    #image: nubisware/conductor-ui_oauth2:2.31
+    image: conductor-ui_oauth2:2.31
     networks:
       - conductor-network
     configs:
@@ -96,8 +97,8 @@ services:
         delay: 5s
         max_attempts: 3
         window: 120s
-    logging:
-      driver: "journald"
+#    logging:
+#      driver: "journald"
 
   pep:
     image: nginx:1.19.8-alpine
@@ -132,7 +133,7 @@ configs:
   swarm-config:
     file: ./conductor-swarm-config.properties
   auth-config:
-    file: ./auth.cfg
+    file: ./oauth2auth.cfg
   db-init:
     file: ./conductor-db-init.sql
   base-config: