corrected local site

This commit is contained in:
Marco Lettere 2021-06-01 10:15:08 +02:00
parent 139043faa2
commit 3224c53ae5
4 changed files with 9 additions and 8 deletions

View File

@ -2,7 +2,7 @@ version: '3.6'
services:
conductor-server:
conductor-server-local:
environment:
- CONFIG_PROP=conductor-swarm-config.properties
image: "nubisware/conductor-server:3.0.4"
@ -22,10 +22,9 @@ services:
logging:
driver: "journald"
conductor-ui:
conductor-ui-local:
environment:
- WF_SERVER=http://conductor-server:8080/api/
- AUTH_CONFIG_PATH=/app/config/auth.config
- WF_SERVER=http://conductor-server-local:8080/api/
image: "nubisware/conductor-ui-oauth2:3.0.4"
networks:
- conductor-network

View File

@ -3,7 +3,8 @@ version: '3.6'
services:
base:
environment:
CONDUCTOR_SERVER: http://conductor-server:8080/api
CONDUCTOR_SERVER: http://conductor-server-local:8080/api/
CONDUCTOR_HEALTH: http://conductor-server-local:8080/health
configs:
- source: base-config
target: /app/config.cfg

View File

@ -1,11 +1,11 @@
upstream _conductor-server {
ip_hash;
server conductor-server:8080;
server conductor-server-local:8080;
}
upstream _conductor-ui {
ip_hash;
server conductor-ui:5000;
server conductor-ui-local:5000;
}
server {
@ -15,6 +15,7 @@ server {
server_name conductor-server;
location / {
proxy_set_header Host $host;
proxy_pass http://_conductor-server;
}

View File

@ -9,7 +9,7 @@ services:
ports:
- "80:80"
deploy:
replicas: 1
replicas: 1
restart_policy:
condition: on-failure
delay: 10s