From de88ecec39b73df8a2b1836b43ed5fba719275d2 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 7 Jan 2021 23:59:24 +0100
Subject: Docker: properly arrange vyos-build dependencies

---
 docker/Dockerfile | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9baed7d..1cc7350 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,20 +66,11 @@ RUN apt-get update && apt-get install -y \
       curl \
       sudo \
       mc \
-      build-essential \
       pbuilder \
       devscripts \
-      squashfs-tools \
-      genisoimage \
       lsb-release \
-      fakechroot \
       libtool \
       libapt-pkg-dev \
-      quilt \
-      python3-git \
-      python3-pip \
-      python3-flake8 \
-      python3-autopep8 \
       flake8 \
       pkg-config \
       debhelper \
@@ -88,6 +79,18 @@ RUN apt-get update && apt-get install -y \
       openssh-client \
       jq
 
+# Packages needed for vyos-build
+RUN apt-get update && apt-get install -y \
+      build-essential \
+      python3-pystache \
+      squashfs-tools \
+      genisoimage \
+      fakechroot \
+      python3-git \
+      python3-pip \
+      python3-flake8 \
+      python3-autopep8
+
 # Syslinux and Grub2 is only supported on x86 and x64 systems
 RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
       apt-get update && apt-get install -y \
@@ -99,6 +102,7 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
 # Building libvyosconf requires a full configured OPAM/OCaml setup
 #
 RUN apt-get update && apt-get install -y \
+      debhelper \
       libffi-dev \
       libpcre3-dev \
       unzip
@@ -129,6 +133,12 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
 RUN eval $(opam env --root=/opt/opam --set-root) && \
     opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#550048b3 -y
 
+# Packages needed for libvyosconfig
+RUN apt-get update && apt-get install -y \
+      quilt \
+      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 && \
-- 
cgit v1.2.3