diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-05-03 13:42:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 13:42:21 +0200 |
| commit | ab665fa3877547e26fde8bfe38c2ffa2fe1ba7e4 (patch) | |
| tree | bba5d042d1e706ab54e35587c367b4225fb45749 | |
| parent | 488ae19a23dcc37f6b2e86edaa28c0724f339b08 (diff) | |
| parent | a095df1bb35cdbfb1d0c1d0acb974e02e85c247d (diff) | |
| download | vyos-build-ab665fa3877547e26fde8bfe38c2ffa2fe1ba7e4.tar.gz vyos-build-ab665fa3877547e26fde8bfe38c2ffa2fe1ba7e4.zip | |
Merge pull request #103 from runborg/T2422
T2422: arm: Docker: Ignore x86/x64 only grub packages on ARM builds
| -rw-r--r-- | docker/Dockerfile | 16 |
1 files 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 \ |