diff options
Diffstat (limited to 'xenial-arm64-tcwg-base')
7 files changed, 60 insertions, 47 deletions
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile index 74a08245..2ba6c04f 100644 --- a/xenial-arm64-tcwg-base/Dockerfile +++ b/xenial-arm64-tcwg-base/Dockerfile @@ -44,7 +44,10 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ groff \ less \ libexpat1-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ libpython2.7-dev \ libreadline-dev \ @@ -62,6 +65,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ openssh-server \ python-dev \ postfix \ + psmisc \ pxz \ qemu-system-arm \ qemu-user \ @@ -73,6 +77,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -101,6 +106,25 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +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 \ + && cd .. \ + && rm -rf ninja + + +COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ + +RUN \ + while read line; do \ + new-user.sh --group $(echo "$line" | cut -d: -f 1,3); \ + done </home-data/group + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -110,4 +134,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: bb32f5a03bcc7864035ebc495cde2ea4 +# checksum: 5d69a0e67de38ed9fb2fd87244c1b6ce diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index 989ef31e..41b05edd 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -1,18 +1,13 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial -COPY new-user.sh /usr/local/bin/ - -RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \ - && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \ - && mkdir -p /home/tcwg-buildslave/workspace - -COPY tcwg-buildslave /home/tcwg-buildslave -COPY tcwg-benchmark /home/tcwg-benchmark - -RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \ - && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \ - && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \ - && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/* - -# checksum: a9bb4838879761da324a80f74d713b07 +RUN while read line; do \ + if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ + continue; \ + fi; \ + new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ + done </home-data/passwd + +# checksum: 443d79e453fa3bdf6ad9089f670cd90f diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile index 4534b5cc..db0cd0ba 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile @@ -1,18 +1,6 @@ # Auto generated from tcwg-base/tcwg-dev/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial -COPY run.sh . -COPY start.sh . - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ @@ -21,29 +9,26 @@ RUN apt-get update \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -RUN sed -i -e '/.*AuthorizedKeysFile/ d' /etc/ssh/sshd_config \ - && echo "AuthorizedKeysFile %h/.ssh/authorized_keys.docker" >> /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 0e9607cbb3dd157d553ffebd26d6a411 +# checksum: 7d7b7765e822f49af3ecb6fad5353a16 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile new file mode 100644 index 00000000..34f161bd --- /dev/null +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -0,0 +1,11 @@ +# Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. +FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial + +COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ + +COPY run.sh start.sh / + +ENTRYPOINT ["/run.sh"] +CMD ["start.sh"] +# checksum: 8498aac781566adf4cb5a246369137bd diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/build.sh b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/build.sh new file mode 120000 index 00000000..2c954456 --- /dev/null +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/build.sh @@ -0,0 +1 @@ +../../tcwg-base/tcwg-host/build.sh
\ No newline at end of file diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/gerrit-branches b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/gerrit-branches new file mode 120000 index 00000000..44e3578e --- /dev/null +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/gerrit-branches @@ -0,0 +1 @@ +../../tcwg-base/tcwg-host/gerrit-branches
\ No newline at end of file diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index a5327736..439570e5 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -2,8 +2,12 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \ + && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ buildbot \ + g++-7 \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -22,19 +26,11 @@ RUN cd ./llvm-config-buildslave/ \ /var/tmp/* \ && sudo -i -u buildslave mkdir /home/buildslave/buildslave -# 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 \ - && cd .. \ - && rm -rf ninja - # Add current clang for libcxx bots. RUN \ - clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \ + clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \ && cd /usr/local \ - && wget --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz \ + && wget --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz \ && tar xf $clang_ver.tar.xz \ && rm $clang_ver.tar.xz @@ -45,4 +41,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: e518582a2a434e66d9c9388c0bd2fa91 +# checksum: 3601aae3505cd568a70051c768ab6cd9 |