summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2020-03-03 22:30:48 +0200
committerzsdc <taras@vyos.io>2020-03-03 22:30:48 +0200
commit12584f04b710fd9dd6913dd790bb8bff9adfb212 (patch)
tree575bd1d63bda821989321b96eef6a0b7c5b19584 /docker
parent6b6ef404083572054f33e98087c5bf77ad445c20 (diff)
downloadvyos-build-12584f04b710fd9dd6913dd790bb8bff9adfb212.tar.gz
vyos-build-12584f04b710fd9dd6913dd790bb8bff9adfb212.zip
OVA: Fixed and extended OVA builds
- added grub2 package to the Dockerfile (required to build OVA) - added open-vmdk to the Dockerfile (required to build OVA) - fixed WAN/LAN confusion in OVF template - added Cloud-init User-Data to the OVF template
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile11
1 files changed, 10 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ea3f3d9c..a094e099 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -85,7 +85,8 @@ RUN apt-get update && apt-get install -y \
gosu \
po4a \
openssh-client \
- jq
+ jq \
+ grub2
# Syslinux is only supported on x86 and x64 systems
RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
@@ -339,6 +340,14 @@ RUN if dpkg-architecture -iarm64; then \
u-boot-tools \
grub-efi-arm; \
fi
+
+# Install open-vmdk
+RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archive/master.zip && \
+ unzip -d /tmp/ /tmp/open-vmdk-master.zip && \
+ cd /tmp/open-vmdk-master/ && \
+ make && \
+ make install
+
#
# live-build: building with local packages fails due to missing keys
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941691