From: Ronny Trommer <ronny@opennms.org>
Date: Mon, 23 Sep 2019 14:39:29 +0000 (+0200)
Subject: issue/5035: Remove warning for missing pytest during build phase and add libcap-dev... 
X-Git-Tag: base_7.3~310^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F5036%2Fhead;p=mirror%2Ffrr.git

issue/5035: Remove warning for missing pytest during build phase and add libcap-dev dependency

Signed-off-by: Ronny Trommer <ronny@opennms.org>
---

diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
index e0b00f9782..60753c1227 100644
--- a/alpine/APKBUILD.in
+++ b/alpine/APKBUILD.in
@@ -13,13 +13,13 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
     c-ares c-ares-dev ca-certificates cryptsetup-libs curl
     device-mapper-libs expat fakeroot flex fortify-headers gdbm
     git gmp isl json-c-dev kmod lddtree libacl libatomic libattr
-    libblkid libburn libbz2 libc-dev libcap libcurl libedit libffi libgcc
+    libblkid libburn libbz2 libc-dev libcap-dev libcurl libedit libffi libgcc
     libgomp libisoburn libisofs libltdl libressl libssh2
     libstdc++ libtool libuuid libyang-dev linux-headers lzip lzo m4 make mkinitfs mpc1
     mpfr3 mtools musl-dev ncurses-libs ncurses-terminfo ncurses-terminfo-base
     patch pax-utils pcre perl pkgconf python2 python2-dev readline
     readline-dev sqlite-libs squashfs-tools sudo tar texinfo xorriso xz-libs
-    py-sphinx rtrlib rtrlib-dev"
+    py-pip py-sphinx rtrlib rtrlib-dev"
 checkdepends="pytest py-setuptools"
 install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index c851f08e0e..88c8f88f81 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -9,7 +9,8 @@ RUN source /src/alpine/APKBUILD.in \
 		--no-cache \
 		--update-cache \
 		$makedepends \
-		gzip
+		gzip \
+	&& pip install pytest
 
 COPY . /src
 ARG PKGVER