summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-01-27 13:10:49 -0600
committerJohn Estabrook <jestabro@vyos.io>2023-01-27 13:11:46 -0600
commit7d85b571ba32c796fc29e879c2cc2dc49a3ff36f (patch)
tree579dc8301965f6bcb663e5c3b6767edb6d0866f9
parentd5ea780295ef8e8aeefb099ed05f78e7ec180b45 (diff)
downloadvyos-build-7d85b571ba32c796fc29e879c2cc2dc49a3ff36f.tar.gz
vyos-build-7d85b571ba32c796fc29e879c2cc2dc49a3ff36f.zip
T4961: update commit refs for vyos1x-config and libvyosconfig
Fix/improve error reporting for configtree.copy
-rw-r--r--docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 711ecaca..8a7720ae 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -140,7 +140,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
# 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#40f7d2af -y
+ opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#ae4b8eec -y
# Packages needed for libvyosconfig
RUN apt-get update && apt-get install -y \
@@ -151,7 +151,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 2f90f3c5 && \
+ cd /tmp/libvyosconfig && git checkout d24dcc68 && \
dpkg-buildpackage -uc -us -tc -b && \
dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb