diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-04-25 19:28:35 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-04-25 19:28:35 +0000 |
| commit | 19fc0ea77678c6811fe1b50fc4f8de58a0ab1ac3 (patch) | |
| tree | f301a70953318905ad6a29247efff4e3feb0289e | |
| parent | 103b1444bdf38057c25e4f4236ab8829a47ea120 (diff) | |
| parent | c55f517719e8941ccedcf5167828bb840da3f302 (diff) | |
| download | gitlab-ce-19fc0ea77678c6811fe1b50fc4f8de58a0ab1ac3.tar.gz | |
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
| -rw-r--r-- | doc/ci/examples/php.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md index aeadd6a448e..db077927126 100644 --- 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 |