From 727aebd6a324b0bfe7fa8a9fa31eecea99471883 Mon Sep 17 00:00:00 2001
From: Christian Franke <chris@opensourcerouting.org>
Date: Tue, 26 Mar 2019 18:27:24 +0100
Subject: [PATCH] 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.
---
 alpine/APKBUILD.in                     | 1 -
 docker/alpine/Dockerfile               | 1 +
 {alpine => docker/alpine}/docker-start | 6 ++++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename {alpine => docker/alpine}/docker-start (51%)

diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
index 969b85f524..75613ae005 100644
--- a/alpine/APKBUILD.in
+++ b/alpine/APKBUILD.in
@@ -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
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index dd29358b07..f19f1e877b 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -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" ]
diff --git a/alpine/docker-start b/docker/alpine/docker-start
similarity index 51%
rename from alpine/docker-start
rename to docker/alpine/docker-start
index 43854ab142..52cfb664ce 100755
--- a/alpine/docker-start
+++ b/docker/alpine/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
-- 
2.39.5