Merge branch 'fix/ci-php-docker-example' into 'master'

Fix php-docker example (for new docker versions) `/.dockerinit` file doesn't exists in new Docker versions. Instead `/.dockerenv` can be used. This MR fixes the PHP example which was working only for older Docker versions. Fixes gitlab-org/gitlab-ci-multi-runner#1241 See merge request !3907

Merge branch 'fix/ci-php-docker-example' into 'master'
19fc0ea7 · Achilleas Pipinellis · 103b1444 · c55f5177 · 19fc0ea7
Commit 19fc0ea7 authored Apr 25, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

php.md doc/ci/examples/php.md +1 -1

No files found.
--- 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 /.dockerinit ]] && exit 0
+[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0

 set -xe