mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-04-28 17:42:20 +00:00
alpine: Move docker-start to Docker build
The standard Alpine package should not install docker glue, so remove it from the APKBUILD and install it in the Dockerfile instead.
This commit is contained in:
parent
d5737d2baa
commit
727aebd6a3
@ -60,7 +60,6 @@ package() {
|
||||
cd "$builddir"
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
install -Dm755 "$srcdir"/docker-start "$pkgdir"$_sbindir
|
||||
install -Dm644 "$srcdir"/daemons "$pkgdir"$_sysconfdir
|
||||
install -d "$pkgdir"/etc/init.d
|
||||
ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr
|
||||
|
@ -32,4 +32,5 @@ RUN mkdir -p /pkgs/apk
|
||||
COPY --from=alpine-builder /pkgs/apk/ /pkgs/apk/
|
||||
RUN apk add --no-cache tini
|
||||
RUN apk add --no-cache --allow-untrusted /pkgs/apk/x86_64/*.apk
|
||||
COPY docker/alpine/docker-start /usr/lib/frr/docker-start
|
||||
ENTRYPOINT [ "/sbin/tini", "--", "/usr/lib/frr/docker-start" ]
|
||||
|
@ -6,5 +6,7 @@ set -e
|
||||
# For volume mounts...
|
||||
##
|
||||
chown -R frr:frr /etc/frr
|
||||
/etc/init.d/frr start
|
||||
exec sleep 10000d
|
||||
/usr/lib/frr/frrinit.sh start
|
||||
|
||||
# Sleep forever
|
||||
exec tail -f /dev/null
|
Loading…
Reference in New Issue
Block a user