Change in docker-playground[master]: Don't run "dpkg --add-architecture i386" on ARM

osmith gerrit-no-reply at lists.osmocom.org
Thu Jun 17 12:19:38 UTC 2021


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/24708 )


Change subject: Don't run "dpkg --add-architecture i386" on ARM
......................................................................

Don't run "dpkg --add-architecture i386" on ARM

Building debian-stretch-jenkins on ARM currently results in a few
libraries getting installed for the i386 architecture. This results in
the following build failures for master-osmo-trx and master-osmo-pcu:

  checking for LIBGNUTLS... no
  configure: error: Package requirements (gnutls >= 2.12.0) were not met:

  No package 'gnutls' found

It is weird that we are only seeing this now, the dpkg-line has been in
debian-stretch-jenkins since the Dockerfile was added to osmo-ci four
years ago in Icb0406f96b0c18e77be51ad8317c2668fb23a45e. I'm also
wondering why it was added in the first place, and if we need it
anymore. In any case, running this on anything but x86_64 does not make
sense, so disable it there.

Change-Id: I8d890b7ebc7b99a4c79779709d1e56e0a5a6d4b9
---
M debian-buster-jenkins/Dockerfile
M debian-jessie-buildslave/Dockerfile
M debian-stretch-jenkins/Dockerfile
3 files changed, 3 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/08/24708/1

diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
index ff69d35..2e3855b 100644
--- a/debian-buster-jenkins/Dockerfile
+++ b/debian-buster-jenkins/Dockerfile
@@ -14,7 +14,7 @@
 
 # Install apt dependencies (keep in alphabetic order)
 RUN \
-	dpkg --add-architecture i386 && \
+	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	DEBIAN_FRONTEND=noninteractive apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile
index 158e19e..98d70a9 100644
--- a/debian-jessie-buildslave/Dockerfile
+++ b/debian-jessie-buildslave/Dockerfile
@@ -3,7 +3,7 @@
 
 MAINTAINER Harald Welte <laforge at gnumonks.org>
 
-RUN	dpkg --add-architecture i386 && \
+RUN	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	apt-get update && \
 	apt-get install -y --no-install-recommends \
 		asciidoc \
diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile
index d794228..b45c1d3 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -14,7 +14,7 @@
 
 # Install apt dependencies (keep in alphabetic order)
 RUN \
-	dpkg --add-architecture i386 && \
+	[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
 	DEBIAN_FRONTEND=noninteractive apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/24708
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I8d890b7ebc7b99a4c79779709d1e56e0a5a6d4b9
Gerrit-Change-Number: 24708
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210617/8f14175b/attachment.htm>


More information about the gerrit-log mailing list