From bdce9244ff9acc57bf04a6c922cc78787aaa8174 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 28 Oct 2019 13:44:47 -0500 Subject: T1773: update Dockerfile for changes to libvyosconfig --- docker/Dockerfile | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 3befeea0..b9fdae85 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -98,40 +98,24 @@ RUN apt-get update && apt-get install -y \ RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --output /tmp/opam_install.sh && \ sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \ - opam init --root=/opt/opam --comp=4.07.0 --disable-sandboxing - -RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam install -y \ - oasis + opam init --root=/opt/opam --comp=4.08.0 --disable-sandboxing RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - fileutils \ - lwt \ - lwt_ppx \ - lwt_log \ - ocplib-endian \ - ounit \ - pcre \ - ppx_deriving_yojson \ - sha \ - toml \ - xml-light \ - batteries \ - ocaml-protoc \ - ctypes-foreign \ - menhir + pcre RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - ctypes + ctypes \ + ctypes-foreign \ + ctypes-build # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyconf https://github.com/vyos/vyconf.git#51d79a3f -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#550048b3 -y # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 9a80a5d3 && \ + cd libvyosconfig && git checkout 5138b5eb && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -- cgit v1.2.3 From ef8d9f1ef6553801cbba3ff19e3944f926ba9c79 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 30 Oct 2019 03:38:37 +0100 Subject: Docker: always use libvyosconfig HEAD revision --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index b9fdae85..2a9006b6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -115,8 +115,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 5138b5eb && \ - dpkg-buildpackage -uc -us -tc -b && \ + cd libvyosconfig && dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb # Packages needed for vyatta-cfg -- cgit v1.2.3 From 5df80f6535cab017074d5e6bbdf5350b68bf0d75 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 6 Nov 2019 17:48:42 +0100 Subject: Revert "Docker: always use libvyosconfig HEAD revision" This reverts commit ef8d9f1ef6553801cbba3ff19e3944f926ba9c79. --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 2a9006b6..b9fdae85 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -115,7 +115,8 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && dpkg-buildpackage -uc -us -tc -b && \ + cd libvyosconfig && git checkout 5138b5eb && \ + dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb # Packages needed for vyatta-cfg -- cgit v1.2.3 From 263c2379eebca8161f0ab70ed55d0503beb1e913 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 8 Nov 2019 10:08:11 -0800 Subject: vyos-qat: adding pkg dependency --- docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index b9fdae85..34733195 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -169,6 +169,11 @@ RUN apt-get update && apt-get install -y \ cmake \ liblua5.2-dev +# Packages needed for vyos-qat +RUN apt-get update && apt-get install -y \ + libboost-dev \ + libudev-dev + # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From e7a834c040cbd9928e9f440534b214b11a4a04a4 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 14 Nov 2019 09:48:00 -0600 Subject: T1804: add python3-psutil to docker image python3-psutil is a dependency of vyos-1x and will be a requirement for the build if, for example, util.py is included in nosetests. --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 34733195..5c4342d5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -63,6 +63,7 @@ RUN apt-get update && apt-get install -y \ python3-coverage \ python3-sphinx \ python3-pystache \ + python3-psutil \ pkg-config \ debhelper \ jq -- cgit v1.2.3