diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-02-01 15:15:55 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-02-01 15:15:55 +0000 |
| commit | c84d7732bdaef94b41ec3b3994d3defebf0a3c39 (patch) | |
| tree | bd6f50e576df8b19f24101d6f85174113093f470 /xenial-arm64-tcwg-base | |
| parent | 3f5a7af993b69fb7a882dd1cc8efaa3d08721215 (diff) | |
xenial-*-tcwg-llvmbot: Regenerate dockerfiles.
Change-Id: I2c3e8268616363b16273cc1fbb6def9180806541
Diffstat (limited to 'xenial-arm64-tcwg-base')
| -rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index 4bd8bc59..1274be64 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -22,17 +22,11 @@ RUN cd ./llvm-config-buildslave/ \ /var/tmp/* \ && sudo -i -u buildslave mkdir /home/buildslave/buildslave -# Replace ninja with a one that supports memory-threshold job limitation. -# When running with "-m 50" ninja will not start new jobs if system memory -# utilization is beyond 50%. -RUN apt-get remove -y ninja-build \ - && git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ +# Add ninja with support for memory-threshold job limitation. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ && cd ninja \ && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ && mv ninja /usr/local/bin/ninja.bin \ - && echo '#!/bin/sh' > /usr/local/bin/ninja \ - && echo '/usr/local/bin/ninja.bin -m 50 -M 50 -D 5000 "$@"' >> /usr/local/bin/ninja \ - && chmod +x /usr/local/bin/ninja \ && cd .. \ && rm -rf ninja @@ -43,4 +37,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: d75d1d29e3fb6928b173b440ee8d332c +# checksum: 4aafd0979d97d1ec6af4b5d73042d466 |