diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-19 14:00:14 -0400 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-19 14:00:14 -0400 |
| commit | 27e0c7723ca1eb85222210a20fd3fee1d77733f7 (patch) | |
| tree | 0b25b0122c7918382c22ab277df421585f9e58b1 /scripts/prepare_build.sh | |
| parent | ee2dc0624093a0fe8665778fd0cc734754e7cdc9 (diff) | |
| parent | 0063194ad6029915361d282392b6ab207ffd1520 (diff) | |
| download | gitlab-ce-ci-commit-as-pipeline.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline
# Conflicts:
# db/schema.rb
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 |