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 /trusty-i386-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 'trusty-i386-tcwg-base')
| -rw-r--r-- | trusty-i386-tcwg-base/Dockerfile | 3 | ||||
| -rw-r--r-- | trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile | 14 |
2 files changed, 14 insertions, 3 deletions
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index d00cd65f..9b84bb95 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -83,7 +83,6 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ valgrind \ vim \ wget \ - wine \ xz-utils \ zip \ zlib1g-dev \ @@ -126,4 +125,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 2a150f304200b3c6bb94dbb6fbd65483 +# checksum: 278e31f5cf7a0a180d3b43d705d4b659 diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index dd271c4c..74c8557b 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -15,4 +15,16 @@ 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: d1a93f00cce488976b44c87865c32888 + +# 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 \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* +# checksum: 50b70f6f0b7cf04d865d6a472c00f215 |