From d8042d3dcdcedf280f5977199246ffb0057a35b9 Mon Sep 17 00:00:00 2001
From: eribeiro <edwardr@senado.leg.br>
Date: Wed, 9 Sep 2020 16:05:38 -0300
Subject: [PATCH] Ajustes

---
 Dockerfile.dev => docker/Dockerfile.dev |  2 +-
 docker/docker-compose-test.yml          | 77 +++++++++++++++++++++++++
 docker/docker-compose.yml               |  6 +-
 3 files changed, 81 insertions(+), 4 deletions(-)
 rename Dockerfile.dev => docker/Dockerfile.dev (85%)
 create mode 100644 docker/docker-compose-test.yml

diff --git a/Dockerfile.dev b/docker/Dockerfile.dev
similarity index 85%
rename from Dockerfile.dev
rename to docker/Dockerfile.dev
index 43b636abc..8d265bf4d 100644
--- a/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,7 +1,7 @@
 FROM python:3.6
 ENV PYTHONUNBUFFERED 1
 WORKDIR /sapl-dev
-COPY requirements ./requirements/
+COPY ../requirements ./requirements/
 RUN apt update && \
     apt -y install graphviz-dev && \
     pip install --upgrade pip && \
diff --git a/docker/docker-compose-test.yml b/docker/docker-compose-test.yml
new file mode 100644
index 000000000..86d3d5f99
--- /dev/null
+++ b/docker/docker-compose-test.yml
@@ -0,0 +1,77 @@
+version: "3.7"
+services:
+  sapldb:
+    image: postgres:10.5-alpine
+    restart: always
+    container_name: postgres
+    labels:
+        NAME: "postgres"
+    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
+    container_name: solr
+    labels:
+        NAME: "solr"
+    volumes:
+      - solr_data:/opt/solr/server/solr
+      - solr_configsets:/opt/solr/server/solr/configsets
+    ports:
+      - "8983:8983"
+    networks:
+      - sapl-net
+  sapl:
+#    image: interlegis/sapl:3.1.161-RC11
+    build:
+      context: ../
+      dockerfile: ./docker/Dockerfile
+      # target: sapl
+    container_name: sapl
+    labels:
+       NAME: "sapl"
+    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
+    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:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index cd785bc1e..0367cb1a0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -33,9 +33,9 @@ services:
       - sapl-net
   sapl:
     image: interlegis/sapl:3.1.161-RC13
-    build:
-      context: ../
-      dockerfile: ./docker/Dockerfile
+#    build:
+#      context: ../
+#      dockerfile: ./docker/Dockerfile
     container_name: sapl
     labels:
        NAME: "sapl"