diff options
Diffstat (limited to 'bionic-amd64-tcwg-base')
6 files changed, 60 insertions, 21 deletions
diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile index ab133638..1e639a57 100644 --- a/bionic-amd64-tcwg-base/Dockerfile +++ b/bionic-amd64-tcwg-base/Dockerfile @@ -1,9 +1,12 @@ # Auto generated from tcwg-base/Dockerfile.in. Do not edit. FROM ubuntu:bionic +# Unminimize Ubuntu Bionic to install contrib files of git (after package +# update, otherwise unminimize's "apt upgrade" might fail). RUN true \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ + && echo y | unminimize \ && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ alien \ @@ -40,14 +43,19 @@ RUN true \ less \ libexpat1-dev \ libglib2.0-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ + libpixman-1-dev \ libpython2.7-dev \ libreadline-dev \ libssl-dev \ libtcnative-1 \ libtool \ linux-tools-generic \ + linux-tools-4.18.0-13-generic \ lzop \ make \ mingw-w64 \ @@ -72,6 +80,7 @@ RUN true \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -85,8 +94,7 @@ RUN true \ /tmp/* \ /var/tmp/* -# Ubuntu Bionic has a quirk in installing contrib files of git; skip for now. -RUN true \ +RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ && sed -i -e 's:^session *required *pam_loginuid.so:# session required pam_loginuid.so:' /etc/pam.d/sshd \ && mkdir -p /var/run/sshd \ && sed -i \ @@ -101,7 +109,25 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password -# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc. +# 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 + +RUN mkdir /tmp/docker-install-qemu.$$ \ + && cd /tmp/docker-install-qemu.$$ \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && tar xf qemu-${qemu_ver}.tar.xz \ + && mkdir build && cd build \ + && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ + && make all install -j $(nproc --all) \ + && cd && rm -rf /tmp/docker-install-qemu.$$ + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -120,4 +146,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 4b61b97898b5eb0c598c220cc2d50f6a +# checksum: af1326e7c8496d13d3b9983562697055 diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile new file mode 100644 index 00000000..2805cc4b --- /dev/null +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile @@ -0,0 +1,24 @@ +# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. +FROM linaro/ci-amd64-tcwg-base-ubuntu:bionic + +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 + +# Install wine. On amd64 arch we need to enable i386, otherwise wine +# won't meet dependencies (this is the case at least for trusty and xenial). +RUN \ + apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + wine-stable \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* +# checksum: edf5a5242fe46cab578b914fe031b6d0 diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh new file mode 120000 index 00000000..50162e02 --- /dev/null +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh @@ -0,0 +1 @@ +../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches new file mode 120000 index 00000000..628350a5 --- /dev/null +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches @@ -0,0 +1 @@ +../../tcwg-base/tcwg-build/gerrit-branches
\ No newline at end of file diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile index 96a5db63..bc19c8c3 100644 --- a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:bionic 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 \ git-gui \ git-svn \ 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/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 286aa782c315c534aeae4e1fef031429 +# checksum: e0acd069d02b7a2424ac723f3a7bf358 diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile index 6691e70a..631ee616 100644 --- a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile @@ -12,8 +12,7 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* -RUN true \ - && apt-get update \ +RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ duplicity \ mate-desktop-environment \ @@ -33,4 +32,4 @@ RUN apt-get update \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 6cae4c37eaa031fb02326a6ebda501f6 +# checksum: a30214ab5fb77eefe535dc3b2edc9d44 |