summaryrefslogtreecommitdiff
path: root/docs/contributing
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-06 19:23:01 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-06 19:23:01 +0100
commit10663220843fc5fcee84512d71e742f8d157e7ce (patch)
tree6d95094d85271fc7c19af18570ebb10ea9ae0f9e /docs/contributing
parent0884d46252f4d0ec587234a61095105bff7529a4 (diff)
downloadvyos-documentation-10663220843fc5fcee84512d71e742f8d157e7ce.tar.gz
vyos-documentation-10663220843fc5fcee84512d71e742f8d157e7ce.zip
contribution: elaborate on Docker container versions
Diffstat (limited to 'docs/contributing')
-rw-r--r--docs/contributing/build-vyos.rst18
1 files changed, 16 insertions, 2 deletions
diff --git a/docs/contributing/build-vyos.rst b/docs/contributing/build-vyos.rst
index c1d741b3..34e1dfba 100644
--- a/docs/contributing/build-vyos.rst
+++ b/docs/contributing/build-vyos.rst
@@ -56,10 +56,15 @@ yourself directly from the source:
found on your local machine when the below command is executed - so no
worries.
-Build iso inside container
+.. note: We require one container per build branch, this means that the used
+ container in ``crux`` and ``current`` can and will differ once we make the
+ move towards Debian (10) Buster.
+
+
+Build ISO inside container
--------------------------
-After generating the container - or fetching it pre-build from Dockerhub you
+After generating the container - or fetching it pre-build from DockerHub you
are all set to invoke yourself a fresh build of a VyOS ISO.
.. code-block:: sh
@@ -70,6 +75,15 @@ are all set to invoke yourself a fresh build of a VyOS ISO.
--build-type release --version 1.2.0
vyos_bld@d4220bb519a0:/vyos# sudo make iso
+To select the container you want to run you need to specify the branch you are
+interested in, this can be easily done by selecting the appropriate container
+image:
+
+* For VyOS 1.2 (crux) use ``vyos/vyos-build:crux``
+* For VyOS 1.3 (equuleus) use ``vyos/vyos-build:crux``
+* For our VyOS rolling release you should use ``vyos/vyos-build`` which will
+ always refer to the latest image.
+
You may use these options to customize you ISO. You can list yourself all
options by calling ``./configure --help``: