Ver a proveniência

Reactivate continuous integration

pull/372/head
Guillaume Vincent há 5 anos
ascendente
cometimento
4222a40af0
3 ficheiros alterados com 29 adições e 10 eliminações
  1. +7
    -9
      .travis.yml
  2. +10
    -1
      containers/webserver/lesspass.conf.j2
  3. +12
    -0
      test.sh

+ 7
- 9
.travis.yml Ver ficheiro

@@ -1,9 +1,7 @@
dist: trusty
language: node_js
node_js:
- 10
- 8
addons:
chrome: stable
before_install:
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
language: python
python:
- "3.6"
services:
- docker
script:
- ./test.sh

+ 10
- 1
containers/webserver/lesspass.conf.j2 Ver ficheiro

@@ -8,7 +8,7 @@ ServerName {{ FQDN }}
</VirtualHost>

<VirtualHost *:443>
ServerName www.{{ FQDN }}
ServerName {{ FQDN }}
ProxyPass /api/ http://backend:8000/api/
ProxyPassReverse /api/ http://backend:8000/api/
SSLEngine on
@@ -17,6 +17,15 @@ ServerName {{ FQDN }}
</VirtualHost>

<VirtualHost *:443>
ServerName api.{{ FQDN }}
ProxyPass / http://backend:8000/api/
ProxyPassReverse / http://backend:8000/api/
SSLEngine on
SSLCertificateFile {{ SSL_CERTIFICATE_FILE }}
SSLCertificateKeyFile {{ SSL_CERTIFICATE_KEY_FILE }}
</VirtualHost>

<VirtualHost *:443>
ServerName www.{{ FQDN }}
ServerAlias {{ FQDN }}


+ 12
- 0
test.sh Ver ficheiro

@@ -0,0 +1,12 @@
#!/usr/bin/env bash
set -e

python3 --version
pushd containers
export COMPOSE_PROJECT_NAME=lesspass
docker-compose build
docker-compose up -d
docker exec -it lesspass_backend_1 sh -c 'python3 wait_db.py'
docker exec -it lesspass_backend_1 sh -c 'python3 manage.py test'
docker-compose down
popd

Carregando…
Cancelar
Guardar