Browse Source

Mais ajustes

pull/3264/head
eribeiro 5 years ago
parent
commit
3bd099ca41
  1. 2
      .travis.yml
  2. 1
      docker/Dockerfile
  3. 2
      docker/docker-compose-test.yml

2
.travis.yml

@ -30,7 +30,7 @@ script:
#- docker-compose up -d
#- docker logs sapl
#- docker-compose rm -f -s -v
- docker-compose -f docker-compose.yml run --workdir="/var/interlegis/sapl" sapl bash -c "cp docker/config/env_test .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

1
docker/Dockerfile

@ -42,7 +42,6 @@ COPY docker/busy-wait.sh $HOME
COPY docker/create_admin.py $HOME
COPY docker/genkey.py $HOME
COPY docker/gunicorn_start.sh $HOME
COPY docker/config/env_test $HOME
COPY docker/config/nginx/sapl.conf /etc/nginx/conf.d
COPY docker/config/nginx/nginx.conf /etc/nginx/nginx.conf

2
docker/docker-compose-test.yml

@ -32,11 +32,9 @@ services:
networks:
- sapl-net
sapl:
# image: interlegis/sapl:3.1.161-RC11
build:
context: ../
dockerfile: ./docker/Dockerfile
# target: sapl
container_name: sapl
labels:
NAME: "sapl"

Loading…
Cancel
Save