Docker: T5076: unbloat container - remove dependencies for strongswan

This commit is contained in:
Christian Breunig 2023-03-09 20:08:26 +01:00
parent 247b44ef7c
commit 30c2f9af0b
3 changed files with 9 additions and 34 deletions

View File

@ -55,6 +55,7 @@ ENV LANG en_US.utf8
ENV OCAML_VERSION 4.12.0 ENV OCAML_VERSION 4.12.0
# Base packaged needed to build packages and their package dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
bash \ bash \
bash-completion \ bash-completion \
@ -67,6 +68,7 @@ RUN apt-get update && apt-get install -y \
mc \ mc \
pbuilder \ pbuilder \
devscripts \ devscripts \
equivs \
lsb-release \ lsb-release \
libtool \ libtool \
libapt-pkg-dev \ libapt-pkg-dev \
@ -336,38 +338,6 @@ RUN apt-get update && apt-get install -y \
libcidr-dev \ libcidr-dev \
check 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 # Packages needed for opennhrp
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libc-ares-dev \ libc-ares-dev \

View File

@ -100,8 +100,6 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP
deleteDir() deleteDir()
} }
} }
} }
stage('arm64') { stage('arm64') {
agent { agent {

View File

@ -56,6 +56,13 @@ def call(description, architecture, pkgList, buildCmd) {
} else if (buildCmd) { } else if (buildCmd) {
sh buildCmd sh buildCmd
} else { } 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 { try {
sh 'dpkg-buildpackage -uc -us -tc -F' sh 'dpkg-buildpackage -uc -us -tc -F'
} catch (e) { } catch (e) {