summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-03-10 22:17:40 +0100
committerChristian Breunig <christian@breunig.cc>2023-03-10 22:17:40 +0100
commit74173b1ba5e524100828983f99ad077cc1f54b57 (patch)
tree6b434fb09eb76fb15913ec146a7897ff3e07cd3d
parent69c585bc269037b106622dead0d56460dc0cae78 (diff)
downloadvyos-build-74173b1ba5e524100828983f99ad077cc1f54b57.tar.gz
vyos-build-74173b1ba5e524100828983f99ad077cc1f54b57.zip
Docker: T5076: unbloat container - remove dependencies for keepalived
-rw-r--r--docker/Dockerfile20
-rw-r--r--packages/keepalived/Jenkinsfile4
2 files changed, 2 insertions, 22 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 30986217..6d73d9b2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -426,26 +426,6 @@ RUN git clone -b 4.4.6 https://github.com/perfsonar/i2util.git /tmp/i2util && \
RUN apt-get update && apt-get install -y \
dh-exec
-# Packages needed for keepalived
-RUN apt-get update && apt-get install -y \
- autoconf \
- libglib2.0-dev \
- libip4tc-dev \
- libipset-dev \
- libjson-c-dev \
- libnfnetlink-dev \
- libnftnl-dev \
- libnl-3-dev \
- libnl-genl-3-dev \
- libnl-nf-3-dev \
- libpcre2-dev \
- libpopt-dev \
- libsnmp-dev \
- libssl-dev \
- libsystemd-dev \
- linux-libc-dev \
- pkg-config
-
# Creating image for embedded systems needs this utilities to prepare a image file
RUN apt-get update && apt-get install -y \
parted \
diff --git a/packages/keepalived/Jenkinsfile b/packages/keepalived/Jenkinsfile
index 41b53183..56fa9db2 100644
--- a/packages/keepalived/Jenkinsfile
+++ b/packages/keepalived/Jenkinsfile
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 VyOS maintainers and contributors
+// Copyright (C) 2022-2023 VyOS maintainers and contributors
//
// This program is free software; you can redistribute it and/or modify
// in order to easy exprort images built to "external" world
@@ -25,7 +25,7 @@ def pkgList = [
['name': 'keepalived',
'scmCommit': 'v2.2.7',
'scmUrl': 'https://github.com/acassen/keepalived',
- 'buildCmd': 'cd ..; ./build.sh'],
+ 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'],
]
// Start package build using library function from https://github.com/vyos/vyos-build