HOT-FIX: conserta docker-compose

docker-compose-dev.yml

@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3.7'
 
 services:
   sapldb-dev:

docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.7"
+services:
   sapldb:
     image: postgres:10.5-alpine
     restart: always
@@ -9,25 +11,28 @@ sapldb:
     volumes:
       - sapldb_data:/var/lib/postgresql/data/
     ports:
-    - "5432:5432"
+      - "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"
-
-#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
+    image: interlegis/sapl:3.1.161-RC0
+    #build: .
     restart: always
     environment:
       ADMIN_PASSWORD: interlegis
@@ -39,16 +44,28 @@ sapl:
       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'
+      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
-  links:
+    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: