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.

This commit is contained in:
Mauro Mugnaini 2021-04-23 18:53:41 +02:00
parent ab66713941
commit 2d4585d086
1 changed files with 9 additions and 8 deletions

View File

@ -34,8 +34,8 @@ services:
- source: swarm-config - source: swarm-config
target: /app/config/conductor-swarm-config.properties target: /app/config/conductor-swarm-config.properties
logging: # logging:
driver: "journald" # driver: "journald"
elasticsearch: elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.8 image: docker.elastic.co/elasticsearch/elasticsearch:5.6.8
@ -48,8 +48,8 @@ services:
conductor-network: conductor-network:
aliases: aliases:
- es - es
logging: # logging:
driver: "journald" # driver: "journald"
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
@ -64,7 +64,8 @@ services:
- WF_SERVER=http://conductor-server:8080/api/ - WF_SERVER=http://conductor-server:8080/api/
- AUTH_CONFIG_PATH=/app/config/auth.config - AUTH_CONFIG_PATH=/app/config/auth.config
#image: nubisware/conductor-ui #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: networks:
- conductor-network - conductor-network
configs: configs:
@ -96,8 +97,8 @@ services:
delay: 5s delay: 5s
max_attempts: 3 max_attempts: 3
window: 120s window: 120s
logging: # logging:
driver: "journald" # driver: "journald"
pep: pep:
image: nginx:1.19.8-alpine image: nginx:1.19.8-alpine
@ -132,7 +133,7 @@ configs:
swarm-config: swarm-config:
file: ./conductor-swarm-config.properties file: ./conductor-swarm-config.properties
auth-config: auth-config:
file: ./auth.cfg file: ./oauth2auth.cfg
db-init: db-init:
file: ./conductor-db-init.sql file: ./conductor-db-init.sql
base-config: base-config: