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
This commit is contained in:
parent
4acbc1874e
commit
8c04ad26ac
|
@ -14,7 +14,7 @@ ARG DEBIAN_VERSION
|
||||||
|
|
||||||
# Install apt dependencies (keep in alphabetic order)
|
# Install apt dependencies (keep in alphabetic order)
|
||||||
RUN \
|
RUN \
|
||||||
dpkg --add-architecture i386 && \
|
[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get update && \
|
DEBIAN_FRONTEND=noninteractive apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
|
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
|
|
|
@ -3,7 +3,7 @@ FROM $USER/debian-jessie-build
|
||||||
|
|
||||||
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
||||||
|
|
||||||
RUN dpkg --add-architecture i386 && \
|
RUN [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
asciidoc \
|
asciidoc \
|
||||||
|
|
|
@ -14,7 +14,7 @@ ARG DEBIAN_VERSION
|
||||||
|
|
||||||
# Install apt dependencies (keep in alphabetic order)
|
# Install apt dependencies (keep in alphabetic order)
|
||||||
RUN \
|
RUN \
|
||||||
dpkg --add-architecture i386 && \
|
[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get update && \
|
DEBIAN_FRONTEND=noninteractive apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
|
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
|
|
Loading…
Reference in New Issue