You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/09/09 19:09:04 UTC
[incubator-streampipes] branch dev updated: [hotfix] update
validation docker-compose.yml
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new a76708b [hotfix] update validation docker-compose.yml
a76708b is described below
commit a76708b6520d74f2e5c49806c8f557c3ebd1925c
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Wed Sep 9 21:08:39 2020 +0200
[hotfix] update validation docker-compose.yml
---
docker-compose.yml | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index cf712d4..55b9236 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,16 @@
#
-version: "2.4"
+version: "3.4"
+
+# global logging
+x-logging:
+ &default-logging
+ options:
+ max-size: '12m'
+ max-file: '5'
+ driver: json-file
+
services:
#### apache/incubator-streampipes
@@ -34,6 +43,7 @@ services:
depends_on:
- consul
- couchdb
+ logging: *default-logging
networks:
spnet:
@@ -50,10 +60,11 @@ services:
- EXECUTION_MODE=MASTER
- SP_CONNECT_CONTAINER_HOST=connect-master
- SP_CONNECT_CONTAINER_WORKER=connect-worker
+ logging: *default-logging
networks:
spnet:
- nginx:
+ ui:
build:
context: ./ui
dockerfile: Dockerfile
@@ -67,12 +78,14 @@ services:
- consul
- connect-master
- backend
+ logging: *default-logging
networks:
spnet:
#### Mandatory external services
activemq:
image: fogsyio/activemq:5.15.9
+ logging: *default-logging
networks:
spnet:
@@ -93,12 +106,14 @@ services:
- -client=0.0.0.0
- -enable-script-checks=true
- -ui
+ logging: *default-logging
networks:
spnet:
ipv4_address: 172.31.0.9
couchdb:
image: fogsyio/couchdb:2.3.1
+ logging: *default-logging
networks:
spnet:
@@ -117,11 +132,13 @@ services:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
volumes:
- /var/run/docker.sock:/var/run/docker.sock
+ logging: *default-logging
networks:
spnet:
zookeeper:
image: fogsyio/zookeeper:3.4.13
+ logging: *default-logging
networks:
spnet:
@@ -131,14 +148,13 @@ services:
- INFLUXDB_DATA_ENGINE=tsm1
- INFLUXDB_REPORTING_DISABLED=false
- INFLUXDB_ADMIN_ENABLED=true
+ logging: *default-logging
networks:
spnet:
networks:
spnet:
driver: bridge
- name: streampipes_network
ipam:
config:
- - subnet: 172.31.0.0/16
- gateway: 172.31.0.1
+ - subnet: 172.31.0.0/16
\ No newline at end of file