summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-09-21 13:42:44 +0200
committerGitHub <noreply@github.com>2018-09-21 13:42:44 +0200
commit6e91656a8a4bbca11591d27487a8719c9ab9eebc (patch)
tree7fdaefea766876163f9dbc2d22aa9878c4cc8612
parent7e4faab33489d6776f7c21e2154468cfe05d1c51 (diff)
parent99185352490f5c05246c4d6d049ce973ebaef1dc (diff)
downloadvyos-build-6e91656a8a4bbca11591d27487a8719c9ab9eebc.tar.gz
vyos-build-6e91656a8a4bbca11591d27487a8719c9ab9eebc.zip
Merge pull request #25 from unixninja92/dockerqemu
T556: Added packages to docker image for building qemu image and vyos-1x
-rw-r--r--Dockerfile19
-rw-r--r--README.md15
2 files changed, 29 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 932fe9f3..0151ae20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# Must be run with --privileged flag
-# Recommended to run the container with a volume mapped
-# in order to easy exprort images built to "external" world
+# Recommended to run the container with a volume mapped
+# in order to easy exprort images built to "external" world
FROM debian:jessie
RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' | tee -a /etc/apt/sources.list &&\
@@ -30,6 +30,21 @@ RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' | tee -a /etc/
libperl-dev \
libnfnetlink-dev \
python3-git \
+ jq \
+ qemu-system-x86 \
+ qemu-utils \
+ quilt \
+ python3-lxml \
+ python3-setuptools \
+ python3-nose \
+ python3-coverage \
&& rm -rf /var/lib/apt/lists/*
+#install packer
+RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \
+ jq -r -M '.current_version')"; \
+ echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_amd64.zip" |\
+ curl -K- | gzip -d > /usr/bin/packer
+RUN chmod +x /usr/bin/packer
+
WORKDIR ~
diff --git a/README.md b/README.md
index 96957fd9..d7831884 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,8 @@ package build scripts will tell you.
## Building the ISO image inside a docker container
Using our `Dockerfile` you can create your own Docker container that can be used
-to build a VyOS ISO image. The `Dockerfile` contains all of the packages needed
-for the VyOS build ISO process.
+to build a VyOS ISO image. The `Dockerfile` contains some of the most used
+packages needed to build a VyOS ISO, a qemu image, and several of the submodules.
```
squashfs-tools # Required for squashfs file system
@@ -102,6 +102,15 @@ bison # Optional, for building vyatta-cfg
libperl-dev # Optional, for building vyatta-cfg
libnfnetlink-dev # Optional, for building vyatta-cfg-vpn
vim # Optional, vim, vi, nano or other text editor
+jq # Optional, for qemu build
+qemu-system-x86 # Optional, for qemu build
+qemu-utils # Optional, for qemu build
+packer # Optional, for qemu build
+quilt # Optional, for building vyos-1x
+python3-lxml # Optional, for building vyos-1x
+python3-setuptools # Optional, for building vyos-1x
+python3-nose # Optional, for building vyos-1x
+python3-coverage # Optional, for building vyos-1x
```
To build the docker image:
@@ -117,7 +126,7 @@ docker run -it --privileged -v /HOST_PATH_OF_VYOS_BUILD_REPO:/vyos -w="/vyos" vy
```
This will drop you into a bash shell with this vyos-build repo mounted at /vyos.
-Then follow the instructions bellow to build the VyOS iso.
+Then follow the instructions bellow to build the VyOS iso and qemu image.
### MacOS and Windows