docker: Move Alpine dependency packages to APKBUILD file

Do not mix APKBUILD and Dockerfile when installing dependencies.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
index fd3c02f47e69867cd4e08a50b129c9da93ed6832..660a118279d3d3f79a700e7ec529f7894f468659 100644 (file)
--- a/alpine/APKBUILD.in
+++ b/alpine/APKBUILD.in
@@ -19,7 +19,7 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
     perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev
     squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev
     py3-sphinx elfutils elfutils-dev libyang-dev protobuf-c-compiler protobuf-c-dev
-    lua5.3-dev lua5.3"
+    lua5.3-dev lua5.3 gzip"
 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 6268d83936ff71276155020739572d440b88510b..b8c79682b1cd67f797bb02130910d29eadfff580 100644 (file)
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -22,10 +22,6 @@ RUN source /src/alpine/APKBUILD.in \
                --no-cache \
                --update-cache \
                $makedepends \
-               gzip \
-               py-pip \
-               rtrlib \
-               protobuf-c-dev \
        && pip install pytest
 RUN mkdir -p /pkgs/apk
 COPY . /src