Install libgif-dev in travisci environment

This commit is contained in:
Clement Michaud 2017-01-28 20:21:30 +01:00
parent 5be5b34522
commit 8d662c1591
6 changed files with 24 additions and 6 deletions

2
.gitignore vendored
View File

@ -10,3 +10,5 @@ coverage/
config.yml config.yml
npm-debug.log npm-debug.log
notifications/

View File

@ -4,13 +4,17 @@ node_js:
services: services:
- docker - docker
- ntp - ntp
addons:
apt:
packages:
- libgif-dev
before_install: npm install -g npm@'>=2.13.5' before_install: npm install -g npm@'>=2.13.5'
script: script:
- npm test - npm test
- docker-compose build - docker-compose build
- docker-compose up -d - docker-compose up -d
- sleep 5 - sleep 5
- scripts/check_services.sh - ./scripts/check_services.sh
deploy: deploy:
provider: npm provider: npm
email: clement.michaud34@gmail.com email: clement.michaud34@gmail.com

View File

@ -6,7 +6,7 @@ services:
- ./test:/usr/src/test - ./test:/usr/src/test
- ./src/views:/usr/src/views - ./src/views:/usr/src/views
- ./src/public_html:/usr/src/public_html - ./src/public_html:/usr/src/public_html
- ./notifications:/var/lib/auth-server/notifications - ./config.yml:/etc/auth-server/config.yml:ro
ldap-admin: ldap-admin:
image: osixia/phpldapadmin:0.6.11 image: osixia/phpldapadmin:0.6.11

View File

@ -7,7 +7,8 @@ services:
- ldap - ldap
restart: always restart: always
volumes: volumes:
- ./config.yml:/etc/auth-server/config.yml:ro - ./config.template.yml:/etc/auth-server/config.yml:ro
- ./notifications:/var/lib/auth-server/notifications
ldap: ldap:
image: dinkel/openldap image: dinkel/openldap

View File

@ -1,3 +0,0 @@
User: user
Subject: Reset your password
Link: https://localhost:8080/authentication/reset-password?identity_token=CmJ51IdJLEcVr7AbbJPANe0wmJoOcgYzPqgGOngVRIhKq1UbQUoS44FXDEXBcolz

14
scripts/check_services.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/bash
service_count=`docker ps -a | grep "Up " | wc -l`
if [ "${service_count}" -eq "3" ]
then
echo "Service are up and running."
exit 0
else
echo "Some services exited..."
docker ps -a
exit 1
fi