From c6b37735ed8246df8cbea0856237a868e19a7604 Mon Sep 17 00:00:00 2001
From: baloola <baloola-mu@hotmail.com>
Date: Mon, 28 Sep 2020 10:36:46 +0200
Subject: [PATCH] re-include logging
---
docker-compose.dem.yml | 2 ++
docker-compose.emg.dev.yml | 18 +++++++++++++-----
docker-compose.vhr18.yml | 2 ++
gitlab_test.sh | 2 +-
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/docker-compose.dem.yml b/docker-compose.dem.yml
index a6f20ad1..e395d45b 100644
--- a/docker-compose.dem.yml
+++ b/docker-compose.dem.yml
@@ -186,5 +186,7 @@ volumes:
redis-data:
cache-db:
instance-data:
+ to-panda:
+ from-fepd:
networks:
intnet:
diff --git a/docker-compose.emg.dev.yml b/docker-compose.emg.dev.yml
index ea6862a7..8e8c7d65 100644
--- a/docker-compose.emg.dev.yml
+++ b/docker-compose.emg.dev.yml
@@ -9,7 +9,8 @@ services:
- type: bind
source: ./data/
target: /data/
-
+ logging:
+ driver: "fluentd"
client:
ports:
- "80:80"
@@ -20,7 +21,9 @@ services:
- type: bind
source: ./data/
target: /data/
-
+ logging:
+ driver: "fluentd"
+ renderer:
ports:
- "81:80"
- "82:8080"
@@ -28,7 +31,8 @@ services:
- type: bind
source: ./data/
target: /data/
-
+ logging:
+ driver: "fluentd"
registrar:
volumes:
- type: bind
@@ -37,7 +41,8 @@ services:
- type: bind
source: ./core/
target: /core/
-
+ logging:
+ driver: "fluentd"
cache:
ports:
- "83:80"
@@ -48,7 +53,8 @@ services:
configs:
- source: mapcache-dev
target: /mapcache-template.xml
-
+ logging:
+ driver: "fluentd"
preprocessor:
volumes:
- type: tmpfs
@@ -59,6 +65,8 @@ services:
- type: bind
source: ./data/
target: /data/
+ logging:
+ driver: "fluentd"
networks:
extnet:
name: emg-extnet
diff --git a/docker-compose.vhr18.yml b/docker-compose.vhr18.yml
index c01debcf..86ba58b9 100644
--- a/docker-compose.vhr18.yml
+++ b/docker-compose.vhr18.yml
@@ -189,5 +189,7 @@ volumes:
redis-data:
cache-db:
instance-data:
+ to-panda:
+ from-fepd:
networks:
intnet:
diff --git a/gitlab_test.sh b/gitlab_test.sh
index 22a81e1a..8b83899d 100644
--- a/gitlab_test.sh
+++ b/gitlab_test.sh
@@ -3,7 +3,7 @@ chmod +x env_setup.sh wait_for_container.sh
./env_setup.sh
docker swarm init
docker network create -d overlay emg-extnet
-docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
+docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml -c docker-compose.logging.yml emg-pvs
apk update && apk add bash postgresql-dev gcc python3-dev musl-dev py-pip gdal
pip3 install -r requirements.txt
./wait_for_container.sh
--
GitLab