<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24708">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't run "dpkg --add-architecture i386" on ARM<br><br>Building debian-stretch-jenkins on ARM currently results in a few<br>libraries getting installed for the i386 architecture. This results in<br>the following build failures for master-osmo-trx and master-osmo-pcu:<br><br>  checking for LIBGNUTLS... no<br>  configure: error: Package requirements (gnutls >= 2.12.0) were not met:<br><br>  No package 'gnutls' found<br><br>It is weird that we are only seeing this now, the dpkg-line has been in<br>debian-stretch-jenkins since the Dockerfile was added to osmo-ci four<br>years ago in Icb0406f96b0c18e77be51ad8317c2668fb23a45e. I'm also<br>wondering why it was added in the first place, and if we need it<br>anymore. In any case, running this on anything but x86_64 does not make<br>sense, so disable it there.<br><br>Change-Id: I8d890b7ebc7b99a4c79779709d1e56e0a5a6d4b9<br>---<br>M debian-buster-jenkins/Dockerfile<br>M debian-jessie-buildslave/Dockerfile<br>M debian-stretch-jenkins/Dockerfile<br>3 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/08/24708/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile</span><br><span>index ff69d35..2e3855b 100644</span><br><span>--- a/debian-buster-jenkins/Dockerfile</span><br><span>+++ b/debian-buster-jenkins/Dockerfile</span><br><span>@@ -14,7 +14,7 @@</span><br><span> </span><br><span> # Install apt dependencies (keep in alphabetic order)</span><br><span> RUN \</span><br><span style="color: hsl(0, 100%, 40%);">-      dpkg --add-architecture i386 && \</span><br><span style="color: hsl(120, 100%, 40%);">+     [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \</span><br><span>      DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span>   DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span>       DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \</span><br><span>diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile</span><br><span>index 158e19e..98d70a9 100644</span><br><span>--- a/debian-jessie-buildslave/Dockerfile</span><br><span>+++ b/debian-jessie-buildslave/Dockerfile</span><br><span>@@ -3,7 +3,7 @@</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUN       dpkg --add-architecture i386 && \</span><br><span style="color: hsl(120, 100%, 40%);">+RUN  [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \</span><br><span>      apt-get update && \</span><br><span>  apt-get install -y --no-install-recommends \</span><br><span>                 asciidoc \</span><br><span>diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile</span><br><span>index d794228..b45c1d3 100644</span><br><span>--- a/debian-stretch-jenkins/Dockerfile</span><br><span>+++ b/debian-stretch-jenkins/Dockerfile</span><br><span>@@ -14,7 +14,7 @@</span><br><span> </span><br><span> # Install apt dependencies (keep in alphabetic order)</span><br><span> RUN \</span><br><span style="color: hsl(0, 100%, 40%);">-   dpkg --add-architecture i386 && \</span><br><span style="color: hsl(120, 100%, 40%);">+     [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \</span><br><span>      DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span>   DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span>       DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24708">change 24708</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/24708"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8d890b7ebc7b99a4c79779709d1e56e0a5a6d4b9 </div>
<div style="display:none"> Gerrit-Change-Number: 24708 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>