From a6d121f3dca813352dc436718af31ed8acfe6293 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 25 Oct 2024 08:55:11 -0500 Subject: docker: T6718: vyos1x-config is now pinned in libvyosconfig build script --- docker/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index ddda5ff8..49d522dc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -152,10 +152,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ fileutils \ xml-light -# Build VyConf which is required to build libvyosconfig -RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#d7260e772e39bc6a3a2d76d629567e03bbad16b5 -y - # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ quilt \ -- cgit v1.2.3 From e4dcc5961ffde974fd4133f29bfc9a2b2f9e4ff8 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 25 Oct 2024 08:59:03 -0500 Subject: docker: T6718: libvyosconfig update for vyconf --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 49d522dc..1697e859 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -161,7 +161,7 @@ RUN apt-get update && apt-get install -y \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \ - cd /tmp/libvyosconfig && git checkout 9e4f6c1494fcff64ad22503b704dbdd43347b0a6 && \ + cd /tmp/libvyosconfig && git checkout 2b979d7fc25793e5be29376a4951375c0bf328d9 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb -- cgit v1.2.3