Skip to content

Commit

Permalink
#4 Добавил скрипт для очиски докера, убрал xvfb class из Jenkinsfile.
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard committed Sep 19, 2016
1 parent be330c1 commit 67da0d8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ node {
docker exec `docker ps -q -f name=.base.` php app/console doctrine:schema:update --force --env=test
docker exec `docker ps -q -f name=.base.` php app/console doctrine:fixtures:load --env=test
docker exec `docker ps -q -f name=.base.` bin/phpunit -c app/
cd base/php-bdd/
bin/behat --config app/config/behat.yml
'''
wrap([$class: 'Xvfb']) {
sh '''
cd base/php-bdd/
bin/behat --config app/config/behat.yml
'''
}
}
stage('Stop and cleanup docker containers') {
sh '''
Expand Down
4 changes: 4 additions & 0 deletions cleandocker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v
docker images --no-trunc | grep '<none>' | awk '{ print $3 }' | xargs -r docker rmi
docker volume ls -qf dangling=true | xargs -r docker volume rm

0 comments on commit 67da0d8

Please sign in to comment.