diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-04-19 10:04:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-04-19 10:04:03 +0000 |
| commit | f1907ffd34bf8685006f7bccdd3560e7ac6b1424 (patch) | |
| tree | c4a29575c7b844bebec0b7e1eb2dd521e2d5798e /app/views/admin | |
| parent | 161a419e3c23dcaaeda4750bba1253404ea71703 (diff) | |
| parent | b3a5f636446376d73d7ec3206a333251ef93cf57 (diff) | |
| download | gitlab-ce-f1907ffd34bf8685006f7bccdd3560e7ac6b1424.tar.gz | |
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
Diffstat (limited to 'app/views/admin')
0 files changed, 0 insertions, 0 deletions