summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2020-03-10 21:18:30 +0200
committerzsdc <taras@vyos.io>2020-03-19 16:31:34 +0200
commit3949cdc476cd9511e2180a1210e99db6869c74fa (patch)
treebbfacaa673a58ec0debf120675d57a1958b6a342 /docker
parent7193ed4798b1876174077b0ae5cca6a64c8ec770 (diff)
downloadvyos-build-3949cdc476cd9511e2180a1210e99db6869c74fa.tar.gz
vyos-build-3949cdc476cd9511e2180a1210e99db6869c74fa.zip
OVA: T2116: 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/Dockerfile10
1 files changed, 9 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 109829e2..78f2d5ef 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -69,7 +69,8 @@ RUN apt-get update && apt-get install -y \
libssl-dev \
libssl1.0.0 \
openssh-client \
- jq
+ jq \
+ grub2
#
# Setup Debian Jessie Backports repository
@@ -346,6 +347,13 @@ RUN apt-get update && apt-get install -y \
python3-six \
python3-yaml
+# 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
+
# Update live-build
RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \
apt-get update && apt-get install -y -t stretch \