diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-12-06 21:37:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-06 21:37:58 +0000 |
| commit | 15c0bd757828a14871b88d08b12c770ce5e0c986 (patch) | |
| tree | c22fb5413425abfbe23eb03b23e5cc34552b933c /docker | |
| parent | 1efcc4c5e123a03438b3d8f176c0bada28f45d15 (diff) | |
| parent | e4dcc5961ffde974fd4133f29bfc9a2b2f9e4ff8 (diff) | |
| download | vyos-build-15c0bd757828a14871b88d08b12c770ce5e0c986.tar.gz vyos-build-15c0bd757828a14871b88d08b12c770ce5e0c986.zip | |
Merge pull request #824 from jestabro/vyconf-minimal
T6718: use the vyconf daemon for validation of set commands
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8be48b33..7fc683f8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -153,10 +153,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 \ @@ -166,7 +162,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 |