summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-03-04 12:47:51 +0100
committerJohn Estabrook <jestabro@vyos.io>2025-03-04 15:23:32 +0100
commitee0c6439086ac1ef969586540c35fdf88d0b5f9c (patch)
tree230e01fe62c0207792072d15bec72c0572215cc4
parentc54fba1fd7422e93db7db1cd1cb3685fa9984650 (diff)
downloadvyos-build-ee0c6439086ac1ef969586540c35fdf88d0b5f9c.tar.gz
vyos-build-ee0c6439086ac1ef969586540c35fdf88d0b5f9c.zip
Docker: T5400: move build of libvyosconfig to vyos-1x
libvyosconfig is both a build and a run dependency of vyos-1x. Satisfying the build dependency within the Docker image requires coordination of updates to vyos-build/libvyosconfig/vyos-1x on any changes to the library; simplify this process by moving the build to a step of the vyos-1x Makefile.
-rw-r--r--docker/Dockerfile7
1 files changed, 0 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3dfcb9f9..ca70c5bf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -160,13 +160,6 @@ RUN apt-get update && apt-get install -y \
libpcre3-dev \
libffi-dev
-# 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 677d1e2bf8109b9fd4da60e20376f992b747e384 && \
- dpkg-buildpackage -uc -us -tc -b && \
- dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb
-
# Packages needed for open-vmdk
RUN apt-get update && apt-get install -y \
zlib1g-dev