Commit f1907ffd authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix/prepare-build-in-docker' into 'master'

Fix prepare build execution in docker environment

In newest versions of docker the `/.dockerinit` file doesn't exists any more (https://github.com/docker/docker/pull/19490). And oo our builds are failing, because the `./scripts/prepare_build.sh` script isn't installing required dependencies.

This MR fixes the problem with backward compatibility for oldest docker environments. 

/cc @grzegorz @douwe 

See merge request !1950
parents 161a419e b3a5f636
...@@ -11,7 +11,7 @@ retry() { ...@@ -11,7 +11,7 @@ retry() {
return 1 return 1
} }
if [ -f /.dockerinit ]; then if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
mkdir -p vendor mkdir -p vendor
# Install phantomjs package # Install phantomjs package
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment