Merge branch 'patch-7' into 'master'

Update php.md - /.dockerinit was removed in v1.11 so the test always results in … See merge request !7882
2016-12-07 10:27:32 +00:00 · 2016-12-07 10:27:32 +00:00 · 9f8a389ac6
parent 51d269f8b3 48d89919e6
commit 9f8a389ac6
1 changed files with 1 additions and 1 deletions
--- a/doc/ci/examples/php.md
+++ b/doc/ci/examples/php.md
@ -40,7 +40,7 @@ repository with the following content:
 #!/bin/bash

 # We need to install dependencies only for Docker
-[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0
+[[ ! -e /.dockerenv ]] && exit 0

 set -xe