summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-19 11:08:52 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-19 11:08:52 +0100
commitae31eb2b0c00249cb6b3a6ebdc8a7bd29e6231eb (patch)
treeb2b6b69aa70112f23cd20510e24dccb1cbefc00c /docker
parent09e7d7c379cfee527ff5c8090ddadc1716f66752 (diff)
downloadvyos-build-ae31eb2b0c00249cb6b3a6ebdc8a7bd29e6231eb.tar.gz
vyos-build-ae31eb2b0c00249cb6b3a6ebdc8a7bd29e6231eb.zip
Docker: T2666: architecture specific package installtion on linux headers
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile9
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index edd9589b..d2b249e3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -114,7 +114,7 @@ RUN apt-get update && apt-get install -y \
libpcre3-dev \
unzip
-# Update certificate store to not crash ocaml package installf
+# Update certificate store to not crash ocaml package install
# Apply fix for https in curl running on armhf
RUN dpkg-reconfigure ca-certificates; \
if dpkg-architecture -iarmhf; then \
@@ -453,7 +453,12 @@ RUN apt-get update && apt-get install -y \
# gcc-multilib is not available on arm64 but required by XDP
RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
apt-get update && apt-get install -y \
- gcc-multilib; \
+ gcc-multilib \
+ linux-headers-amd64; \
+ elif dpkg-architecture -iarm64; then \
+ apt-get update && apt-get install -y \
+ linux-headers-arm64; \
+ ln -s /usr/include/asm-generic /usr/include/asm; \
fi
# Install libbpf packages from Debian Buster Backports