From aa2bff5ff5cedb3979f3677a5d45fd029db61a20 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Sat, 26 Jan 2019 05:10:04 +0700
Subject: Install Menhir with opam and use an opam pin for installing vyconf

Quite a bit shorter than running the whole vyconf build sequence by hand.
---
 docker/Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d951a8ff..e77cb540 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -208,7 +208,8 @@ RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --o
       xml-light \
       batteries \
       ocaml-protoc \
-      ctypes-foreign
+      ctypes-foreign \
+      menhir
 
 RUN eval $(opam env) && opam install -y \
       ctypes
@@ -218,11 +219,7 @@ RUN eval $(opam env) && \
     git clone https://github.com/vyos/vyconf.git && \
     cd vyconf && \
     git checkout 0f121c12a84200 && \
-    ./build-setup.sh && \
-    ./configure --enable-tests && \
-    make && \
-    make test && \
-    make install
+    opam pin add vyconf.
 
 # Build libvyosconfig
 RUN eval $(opam env) && \
-- 
cgit v1.2.3