Docker: T5076: unbloat container - remove dependencies for strongswan

3 files changed, 9 insertions, 34 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1f364a2f..f81b86cb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -55,6 +55,7 @@ ENV LANG en_US.utf8
 
 ENV OCAML_VERSION 4.12.0
 
+# Base packaged needed to build packages and their package dependencies
 RUN apt-get update && apt-get install -y \
       bash \
       bash-completion \
@@ -67,6 +68,7 @@ RUN apt-get update && apt-get install -y \
       mc \
       pbuilder \
       devscripts \
+      equivs \
       lsb-release \
       libtool \
       libapt-pkg-dev \
@@ -336,38 +338,6 @@ RUN apt-get update && apt-get install -y \
       libcidr-dev \
       check
 
-# Packages needed for vyos-strongswan
-RUN apt-get update && apt-get install -y \
-      bison \
-      bzip2 \
-      debhelper \
-      dh-apparmor \
-      dpkg-dev \
-      flex \
-      gperf \
-      libxtables-dev \
-      libcap-dev \
-      libcurl4-openssl-dev \
-      libgcrypt20-dev \
-      libgmp3-dev \
-      libiptc-dev \
-      libkrb5-dev \
-      libldap2-dev \
-      libnm-dev \
-      libpam0g-dev \
-      libsqlite3-dev \
-      libssl-dev \
-      libsystemd-dev \
-      libtool \
-      libtss2-dev \
-      libxml2-dev \
-      pkg-config \
-      po-debconf \
-      systemd \
-      tzdata \
-      python3-setuptools \
-      python3-stdeb
-
 # Packages needed for opennhrp
 RUN apt-get update && apt-get install -y \
       libc-ares-dev \
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy
index 42c449bc..fa2403e3 100644
--- a/vars/buildPackage.groovy
+++ b/vars/buildPackage.groovy
@@ -100,8 +100,6 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP
                                 deleteDir()
                             }
                         }
-
-
                     }
                     stage('arm64') {
                         agent {
diff --git a/vars/cloneAndBuild.groovy b/vars/cloneAndBuild.groovy
index b2045a0b..48d73a66 100644
--- a/vars/cloneAndBuild.groovy
+++ b/vars/cloneAndBuild.groovy
@@ -56,6 +56,13 @@ def call(description, architecture, pkgList, buildCmd) {
         } else if (buildCmd) {
             sh buildCmd
         } else {
+            // build dependency package and install it
+            sh """
+                if [ -f debian/control ]; then
+                    sudo mk-build-deps --install debian/control
+                    sudo dpkg -i *build-deps*.deb
+                fi
+            """
             try {
                 sh 'dpkg-buildpackage -uc -us -tc -F'
             } catch (e) {