WIP2

.travis.yml

@@ -25,12 +25,12 @@ install:
 
 script:
   - cd $TRAVIS_BUILD_DIR/docker
-  # Build master images and run the webserver
+  # Build master images and run the webserver (tests end to end)
-  - docker-compose build
+  #- docker-compose -f docker-compose.test.yml build
-  - docker-compose up -d
+  #- docker-compose up -d
-  - docker logs sapl
+  #- docker logs sapl
-  - docker-compose rm -f -s -v
+  #- docker-compose rm -f -s -v
-  - docker-compose -f docker-compose.yml run --workdir="/var/interlegis/sapl" sapl bash -c "cp config/env_dockerfile .env && py.test --create-db"
+  - docker-compose -f docker-compose.test.yml run --workdir="/var/interlegis/sapl" sapl bash -c "cp docker/config/env_test .env && py.test --create-db"
 
 after_script:
   # Cleanup docker containers, images, and volumes

docker/config/env_dockerfile

@@ -1,5 +1,5 @@
 DATABASE_URL = sqlite:///sapl.db
-SECRET_KEY = 'Dockerfile_Key'
+SECRET_KEY = 'mzp++@i1y-6y8ez_=^sfbr!dzuyry#^@v(3g^2d1k9%f=+mhlb'
 DEBUG = False
 EMAIL_USE_TLS = True
 EMAIL_PORT = 587

docker/config/env_test

@@ -0,0 +1,9 @@
+DATABASE_URL = postgresql://sapl:sapl@sapldb:5432/sapl
+SECRET_KEY=test++@i1y-6y8ez_=^sfbr!dzuyry#^@v(3g^2d1k9%f=+mhlb
+DEBUG = True
+EMAIL_USE_TLS = True
+EMAIL_PORT = 587
+EMAIL_HOST = ''
+EMAIL_HOST_USER = ''
+EMAIL_SEND_USER = ''
+EMAIL_HOST_PASSWORD = ''

docker/docker-compose.test.yml

@@ -0,0 +1,91 @@
+##
+##
+## ATENÇÃO: A ATUALIZAÇÃO DESTE ARQUIVO EM AMBIENTES DE PRODUÇÃO PODE CAUSAR PERDA DE DADOS
+##
+## Esta atualização da versão e formato do arquivo docker-compose.yml pode POTENCIALMENTE causar
+## a perda de dados. Portanto, aconselha-se a fazer o BACKUP da base de dados do PostgreSQL e
+## da pasta 'media', assim como outros arquivos que julgar necessários, mas não expresso neste
+## disclaimer por PRECAUÇÃO.
+##
+## Adicionalmente, temos um novo container (saplsolr) que possui seus volumes que devem ser
+## mapeados para um diretório no host da máquina.
+##
+##
+version: "3.7"
+services:
+    sapldb:
+      image: postgres:10.5-alpine
+      container_name: postgres
+      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:7.4-alpine
+      container_name: solr
+      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
+
+    sapl:
+      image: sapl
+      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
+      links:
+        - sapldb
+        - saplsolr
+      depends_on:
+        - sapldb
+        - saplsolr
+      networks:
+        - sapl-net
+      ports:
+        - "80:80"
+volumes:
+   sapl_data:
+   sapl_media:
+   sapldb_data:
+   solr_data:
+   solr_configsets:
+
+networks:
+   sapl-net:
+      driver: bridge

release.sh

@@ -30,11 +30,11 @@ FINAL_VERSION=
 
 function change_files {
 
-    OLD_VERSION=$(grep -E 'interlegis/sapl:'$VERSION_PATTERN docker-compose.yml | cut -d':' -f3)
+    OLD_VERSION=$(grep -E 'interlegis/sapl:'$VERSION_PATTERN docker/docker-compose.yml | cut -d':' -f3)
 
     echo "Atualizando de "$OLD_VERSION" para "$FINAL_VERSION
 
-    sed -E -i "s|$OLD_VERSION|$FINAL_VERSION|g" docker-compose.yml
+    sed -E -i "s|$OLD_VERSION|$FINAL_VERSION|g" docker/docker-compose.yml
 
     sed -E -i "s|$OLD_VERSION|$FINAL_VERSION|g" setup.py