Merge branch 'docker_clean_images' into 'dev'

.gitlab-ci.yml remove containers after func tests

See merge request !312

.gitlab-ci.yml

@@ -300,8 +300,10 @@ test_server_functional:
     - docker exec docker_nginx_1 make -C /usr/share/vidjil browser
     - source /etc/profile.d/rvm.sh
     - rvm use 2.1.1
-    - HEADLESS=1 make functional_server || (cd docker && docker-compose stop; false)
+    - HEADLESS=1 make functional_server || (cd docker && docker-compose stop; docker stop $(docker ps -aq); docker rm $(docker ps -aq); docker rmi "vidjil/server:test" "vidjil/client:test"; false)
     - cd docker && docker-compose stop
+    - docker stop $(docker ps -aq)
+    - docker rm $(docker ps -aq)
     - docker rmi "vidjil/server:test" "vidjil/client:test"
   only:
     - /^feature-.*s.*\/.*$/