From 50031c4d6de13173f7472c8dd2f88913d2ade525 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Tue, 29 Oct 2019 20:37:29 +0200
Subject: [PATCH] Upgrade to v0.12

---
 docker-compose-unified.yml | 45 +++++++++++++------------
 docker-compose.yml         | 67 ++++++++++++++++++++------------------
 2 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/docker-compose-unified.yml b/docker-compose-unified.yml
index bc429d9..c1a2f84 100644
--- a/docker-compose-unified.yml
+++ b/docker-compose-unified.yml
@@ -11,20 +11,18 @@ services:
     - 8008:8008
     - 8080:80
     - 8081:8081
-    restart: always
+    restart: unless-stopped
     volumes:
-    - type: bind
-      source: /opt/trains/logs
-      target: /var/log/trains
-    - type: bind
-      source: /opt/trains/data/fileserver
-      target: /mnt/fileserver
+    - /opt/trains/logs:/var/log/trains
+    - /opt/trains/data/fileserver:/mnt/fileserver
     depends_on:
+      - redis
       - mongo
       - elasticsearch
     environment:
-      ELASTIC_SERVICE_SERVICE_HOST: elasticsearch
-      MONGODB_SERVICE_SERVICE_HOST: mongo
+      ELASTIC_SERVICE_HOST: elasticsearch
+      MONGODB_SERVICE_HOST: mongo
+      REDIS_SERVICE_HOST: redis
     networks:
       - backend
   elasticsearch:
@@ -52,12 +50,13 @@ services:
       memlock:
         soft: -1
         hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
     image: docker.elastic.co/elasticsearch/elasticsearch:5.6.16
-    restart: always
+    restart: unless-stopped
     volumes:
-    - type: bind
-      source: /opt/trains/data/elastic
-      target: /usr/share/elasticsearch/data
+    - /opt/trains/data/elastic:/usr/share/elasticsearch/data
     ports:
     - "9200:9200"
   mongo:
@@ -65,17 +64,23 @@ services:
       - backend
     container_name: trains-mongo
     image: mongo:3.6.5
-    restart: always
+    restart: unless-stopped
     command: --setParameter internalQueryExecMaxBlockingSortBytes=196100200
     volumes:
-    - type: bind
-      source: /opt/trains/data/mongo/db
-      target: /data/db
-    - type: bind
-      source: /opt/trains/data/mongo/configdb
-      target: /data/configdb
+    - /opt/trains/data/mongo/db:/data/db
+    - /opt/trains/data/mongo/configdb:/data/configdb
     ports:
     - "27017:27017"
+  redis:
+    networks:
+      - backend
+    container_name: trains-redis
+    image: redis:5.0
+    restart: unless-stopped
+    volumes:
+    - /opt/trains/data/redis:/data
+    ports:
+    - "6379:6379"
 
 networks:
   backend:
diff --git a/docker-compose.yml b/docker-compose.yml
index 31aa0dc..2312d66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,29 +1,29 @@
 version: "3.6"
 services:
+
   apiserver:
     command:
     - apiserver
     container_name: trains-apiserver
     image: allegroai/trains:latest
-    restart: always
+    restart: unless-stopped
     volumes:
-    - type: bind
-      source: /opt/trains/logs
-      target: /var/log/trains
-    - type: bind
-      source: /opt/trains/config
-      target: /opt/trains/config
+    - /opt/trains/logs:/var/log/trains
+    - /opt/trains/config:/opt/trains/config
     depends_on:
+      - redis
       - mongo
       - elasticsearch
       - fileserver
     environment:
-      ELASTIC_SERVICE_SERVICE_HOST: elasticsearch
-      MONGODB_SERVICE_SERVICE_HOST: mongo
+      ELASTIC_SERVICE_HOST: elasticsearch
+      MONGODB_SERVICE_HOST: mongo
+      REDIS_SERVICE_HOST: redis
     ports:
     - "8008:8008"
     networks:
       - backend
+
   elasticsearch:
     networks:
       - backend
@@ -49,14 +49,16 @@ services:
       memlock:
         soft: -1
         hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
     image: docker.elastic.co/elasticsearch/elasticsearch:5.6.16
-    restart: always
+    restart: unless-stopped
     volumes:
-    - type: bind
-      source: /opt/trains/data/elastic
-      target: /usr/share/elasticsearch/data
+    - /opt/trains/data/elastic:/usr/share/elasticsearch/data
     ports:
     - "9200:9200"
+
   fileserver:
     networks:
       - backend
@@ -64,44 +66,45 @@ services:
     - fileserver
     container_name: trains-fileserver
     image: allegroai/trains:latest
-    restart: always
+    restart: unless-stopped
     volumes:
-    - type: bind
-      source: /opt/trains/logs
-      target: /var/log/trains
-    - type: bind
-      source: /opt/trains/data/fileserver
-      target: /mnt/fileserver
+    - /opt/trains/logs:/var/log/trains
+    - /opt/trains/data/fileserver:/mnt/fileserver
     ports:
     - "8081:8081"
+
   mongo:
     networks:
       - backend
     container_name: trains-mongo
     image: mongo:3.6.5
-    restart: always
+    restart: unless-stopped
     command: --setParameter internalQueryExecMaxBlockingSortBytes=196100200
     volumes:
-    - type: bind
-      source: /opt/trains/data/mongo/db
-      target: /data/db
-    - type: bind
-      source: /opt/trains/data/mongo/configdb
-      target: /data/configdb
+    - /opt/trains/data/mongo/db:/data/db
+    - /opt/trains/data/mongo/configdb:/data/configdb
     ports:
     - "27017:27017"
-  webserver:
+
+  redis:
     networks:
       - backend
+    container_name: trains-redis
+    image: redis:5.0
+    restart: unless-stopped
+    volumes:
+    - /opt/trains/data/redis:/data
+    ports:
+    - "6379:6379"
+
+  webserver:
     command:
     - webserver
     container_name: trains-webserver
     image: allegroai/trains:latest
-    restart: always
+    restart: unless-stopped
     volumes:
-    - type: bind
-      source: /opt/trains/logs
-      target: /var/log/trains
+    - /opt/trains/logs:/var/log/trains
     depends_on:
       - apiserver
     ports: