diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-20 22:39:14 +0300 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-20 22:39:14 +0300 |
| commit | 27083f7885637143ca3a914b3c1391caec5ec231 (patch) | |
| tree | 3fc64e333dd99d6f04b6759292b4657e3f71df44 | |
| parent | 3fed088e1bad574674229fe2649be532b97d7c3f (diff) | |
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>
| -rw-r--r-- | alpine/APKBUILD.in | 2 | ||||
| -rw-r--r-- | docker/alpine/Dockerfile | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index fd3c02f47e..660a118279 100644 --- 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 6268d83936..b8c79682b1 100644 --- 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 |