diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-04-30 17:48:36 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-04-30 17:59:06 +0000 |
| commit | 1cce30f33ed031b26628402ebd06737c8931d58d (patch) | |
| tree | 5f167df1a68b199082d4465f38696bc3b5e19353 /xenial-amd64-tcwg-base | |
| parent | 4c75c9560bcd75dac52ed3ca53b46575d6ba6781 (diff) | |
tcwg-base, tcwg-build: Move installation of wine to tcwg-build images
Turns out "dpkg --add-architecture i386" in amd64's tcwg-base images
was necessary to install wine. Since wine with its i386 dependencies
increase image size by ~600MB, install it only in tcwg-build images for
the purposes of automated release testing.
Hopefully, we will be able to ditch testing of mingw releases.
Change-Id: I0c177409c720cb07070d769d6ed693d1bfdc31df
Diffstat (limited to 'xenial-amd64-tcwg-base')
| -rw-r--r-- | xenial-amd64-tcwg-base/Dockerfile | 3 | ||||
| -rw-r--r-- | xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile index 910a7354..2a79e1ee 100644 --- a/xenial-amd64-tcwg-base/Dockerfile +++ b/xenial-amd64-tcwg-base/Dockerfile @@ -81,7 +81,6 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ vim \ virtualenv \ wget \ - wine \ xz-utils \ zip \ zlib1g-dev \ @@ -124,4 +123,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 1ca472bbd2df82f0d2c86bd2517231a9 +# checksum: d6426c98ebf329fc4ef1ea8b8194f758 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 8106b7bc..23b8fb7b 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile @@ -15,4 +15,17 @@ 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: 710acbfdcccff739b76435ef75be994e + +# 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 \ + dpkg --add-architecture i386 && \ + apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + wine \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* +# checksum: 0f60af30bf7b204b2997d062f2291e04 |