Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: Fix build for Alpine Linux after the recent changes since 9.1 #15457

Merged
merged 7 commits into from
Mar 12, 2024
Merged

docker: Fix build for Alpine Linux after the recent changes since 9.1 #15457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ca01bf
docker: Use libyang 2.1.128 for Alpine builds
ton31337 Feb 29, 2024
f03b0bf
lib: Fix unknown sig_atomic_t compile error
ton31337 Feb 29, 2024
e9ff594
vtysh: Include fnctl.h for vtysh_main
ton31337 Feb 29, 2024
fd93b7d
docker: Use Alpine Linux version 3.19
ton31337 Feb 29, 2024
3f7cc3b
docker: Do not use pip Python package manager
ton31337 Feb 29, 2024
b0b0d7a
docker: Fix post function for Alpine build (package)
ton31337 Feb 29, 2024
a201559
lib: Drop include/linux/mroute[6].h
ton31337 Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions alpine/APKBUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ source="$pkgname-$pkgver.tar.gz"

builddir="$srcdir"/$pkgname-$pkgver

_sysconfdir=/etc
_sbindir=/usr/lib/frr
_libdir=/usr/lib
_user=frr
Expand All @@ -36,7 +37,7 @@ build() {

./configure \
--prefix=/usr \
--sysconfdir=/etc \
--sysconfdir=$_sysconfdir \
--localstatedir=/var \
--sbindir=$_sbindir \
--libdir=$_libdir \
Expand All @@ -61,7 +62,9 @@ package() {
cd "$builddir"
make DESTDIR="$pkgdir" install

install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir/daemons
install -d "$pkgdir"/etc/init.d
ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr
install -d $pkgdir/$_sysconfdir/frr
install -m 0644 tools/etc/frr/daemons $pkgdir/$_sysconfdir/frr/daemons

install -d $pkgdir/$_sysconfdir/init.d
ln -s ${_sbindir}/frr $pkgdir/$_sysconfdir/init.d/frr
}
9 changes: 4 additions & 5 deletions docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

# Create a basic stage set up to build APKs
FROM alpine:3.18 as alpine-builder
FROM alpine:3.19 as alpine-builder
RUN apk add \
--update-cache \
abuild \
Expand All @@ -24,7 +24,7 @@ RUN cd /src/libyang \
&& abuild -r -P /pkgs/apk

# This stage builds a dist tarball from the source
FROM alpine:3.18 as source-builder
FROM alpine:3.19 as source-builder
RUN mkdir -p /src/alpine /pkgs/apk
COPY alpine/APKBUILD.in /src/alpine
COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk
Expand All @@ -33,8 +33,7 @@ RUN source /src/alpine/APKBUILD.in \
&& apk add \
--no-cache \
--update-cache \
$makedepends \
&& pip install pytest
$makedepends
COPY . /src
ARG PKGVER
RUN cd /src \
Expand All @@ -58,7 +57,7 @@ RUN cd /dist \
&& abuild -r -P /pkgs/apk

# This stage installs frr from the apk
FROM alpine:3.18
FROM alpine:3.19
RUN mkdir -p /pkgs/apk
COPY --from=alpine-apk-builder /pkgs/apk/ /pkgs/apk/
RUN apk add \
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine/libyang/APKBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <[email protected]>
# Maintainer: Christian Franke <[email protected]>
pkgname=libyang
pkgver=2.1.80
pkgver=2.1.128
pkgrel=0
pkgdesc="YANG data modelling language parser and toolkit"
url="https://github.com/CESNET/libyang"
Expand Down
193 changes: 0 additions & 193 deletions include/linux/mroute.h
View file
Open in desktop

This file was deleted.

Loading
Loading