diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-26 16:36:17 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-26 16:36:17 +0200 |
| commit | cb90368a692149b4e01b50d7c6682c48cffa438b (patch) | |
| tree | 6236d6f4fd56acad1015950d483db0ba8fa3ada9 /scripts/prepare_build.sh | |
| parent | c6f19aed51736e5945283a611eae09f32a9b5aeb (diff) | |
| parent | f127edd012bd8b6f76ac67d69aadbd7d4837258f (diff) | |
| download | gitlab-ce-cb90368a692149b4e01b50d7c6682c48cffa438b.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'scripts/prepare_build.sh')
| -rwxr-xr-x | scripts/prepare_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 4a7ee7dbb64..247383aa46c 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -11,7 +11,7 @@ retry() { return 1 } -if [ -f /.dockerinit ]; then +if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then mkdir -p vendor # Install phantomjs package |