From fdfcb6a35a48e05c07fd2f16040198ab4fa961ae Mon Sep 17 00:00:00 2001
From: eribeiro <edwardr@senado.leg.br>
Date: Tue, 26 May 2020 16:39:00 -0300
Subject: [PATCH] HOT-FIX: conserta docker-compose

---
 docker-compose-dev.yml |   2 +-
 docker-compose.yml     | 125 +++++++++++++++++++++++------------------
 2 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index cabe94205..72f7b8fb5 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3.7'
 
 services:
   sapldb-dev:
diff --git a/docker-compose.yml b/docker-compose.yml
index 44cfed606..6ef653487 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,54 +1,71 @@
-sapldb:
-  image: postgres:10.5-alpine
-  restart: always
-  environment:
-    POSTGRES_PASSWORD: sapl
-    POSTGRES_USER: sapl
-    POSTGRES_DB: sapl
-    PGDATA : /var/lib/postgresql/data/
-  volumes:
-    - sapldb_data:/var/lib/postgresql/data/
-  ports:
-    - "5432:5432"
-saplredis:
-  image: redis:5.0.3-stretch
-  restart: always
-  ports: 
-    - "6379:6379"
-
-#saplsolr:
-#  image: solr:7.4-alpine
-#  restart: always
-#  command: bin/solr start -c -f
-#  volumes:
-#    - solr_data:/opt/solr/server/solr
-#    - solr_configsets:/opt/solr/server/solr/configsets
-#  ports:
-#    - "8983:8983"
-
-sapl:
-  image: interlegis/sapl:master
-  restart: always
-  environment:
-    ADMIN_PASSWORD: interlegis
-    ADMIN_EMAIL: email@dominio.net
-    DEBUG: 'False'
-    EMAIL_PORT: 587
-    EMAIL_USE_TLS: 'False'
-    EMAIL_HOST: smtp.dominio.net
-    EMAIL_HOST_USER: usuariosmtp
-    EMAIL_SEND_USER: usuariosmtp
-    EMAIL_HOST_PASSWORD: senhasmtp
-    USE_CHANNEL_LAYERS: 'True'
-    PORT_CHANNEL_LAYERS: 6379
-    HOST_CHANNEL_LAYERS: saplredis
-    USE_SOLR: 'False'
-    TZ: America/Sao_Paulo
-  volumes:
-    - sapl_data:/var/interlegis/sapl/data
-    - sapl_media:/var/interlegis/sapl/media
-  links:
-    - sapldb
-    - saplredis
-  ports:
-    - "80:80"
+version: "3.7"
+services:
+  sapldb:
+    image: postgres:10.5-alpine
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: sapl
+      POSTGRES_USER: sapl
+      POSTGRES_DB: sapl
+      PGDATA : /var/lib/postgresql/data/
+    volumes:
+      - sapldb_data:/var/lib/postgresql/data/
+    ports:
+      - "5433:5432"
+    networks:
+      - sapl-net
+  saplsolr:
+    image: solr:8.3
+    restart: always
+    command: bin/solr start -c -f
+    volumes:
+      - solr_data:/opt/solr/server/solr
+      - solr_configsets:/opt/solr/server/solr/configsets
+    ports:
+      - "8983:8983"
+    networks:
+      - sapl-net
+  saplredis:
+    image: redis:5.0.3-stretch
+    restart: always
+    ports:
+      - "6379:6379"
+  sapl:
+    image: interlegis/sapl:3.1.161-RC0
+    #build: .
+    restart: always
+    environment:
+      ADMIN_PASSWORD: interlegis
+      ADMIN_EMAIL: email@dominio.net
+      DEBUG: 'False'
+      EMAIL_PORT: 587
+      EMAIL_USE_TLS: 'False'
+      EMAIL_HOST: smtp.dominio.net
+      EMAIL_HOST_USER: usuariosmtp
+      EMAIL_SEND_USER: usuariosmtp
+      EMAIL_HOST_PASSWORD: senhasmtp
+      USE_SOLR: 'True'
+      SOLR_COLLECTION: sapl
+      SOLR_URL: http://saplsolr:8983
+      TZ: America/Sao_Paulo
+    volumes:
+      - sapl_data:/var/interlegis/sapl/data
+      - sapl_media:/var/interlegis/sapl/media
+    depends_on:
+      - sapldb
+      - saplsolr
+      - saplredis
+    ports:
+      - "80:80"
+    networks:
+      - sapl-net
+networks:
+  sapl-net:
+    name: sapl-net
+    driver: bridge
+volumes:
+  sapldb_data:
+  sapl_data:
+  sapl_media:
+  solr_data:
+  solr_configsets: