From a095df1bb35cdbfb1d0c1d0acb974e02e85c247d Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sun, 3 May 2020 13:05:44 +0200 Subject: T2422: arm: Docker: Ignore x86/x64 only grub packages on ARM builds Because of newly added dependencies to the packages grub2, grub-pc and grub2-common the container is not buildable for ARM and ARM64. These packages are only available on intel platforms and needs to be ignored on everything else. --- docker/Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 32d9e808..c72a4f33 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -85,12 +85,13 @@ RUN apt-get update && apt-get install -y \ gosu \ po4a \ openssh-client \ - jq \ - grub2 + jq -# Syslinux is only supported on x86 and x64 systems +# Syslinux and Grub2 is only supported on x86 and x64 systems RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ - apt-get update && apt-get install -y syslinux; \ + apt-get update && apt-get install -y \ + syslinux \ + grub2; \ fi # Package needed for mdns-repeater @@ -311,12 +312,15 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ fi # Packages needed for building vmware and GCE images -RUN apt-get update && apt-get install -y \ +# This is only supported on i386 and amd64 platforms +RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ + apt-get update && apt-get install -y \ kpartx \ parted \ udev \ grub-pc \ - grub2-common + grub2-common; \ + fi # Packages needed for vyos-cloud-init RUN apt-get update && apt-get install -y \ -- cgit v1.2.3