diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2019-03-26 18:27:24 +0100 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2019-03-26 18:32:50 +0100 |
| commit | 727aebd6a324b0bfe7fa8a9fa31eecea99471883 (patch) | |
| tree | 72b9a348f7d9954dcac35e4ef2cd1ecca3e1f497 /alpine | |
| parent | Merge pull request #3983 from opensourcerouting/pim-tests (diff) | |
| download | frr-727aebd6a324b0bfe7fa8a9fa31eecea99471883.tar.xz frr-727aebd6a324b0bfe7fa8a9fa31eecea99471883.zip | |
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.
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/APKBUILD.in | 1 | ||||
| -rwxr-xr-x | alpine/docker-start | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index 969b85f52..75613ae00 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/alpine/docker-start b/alpine/docker-start deleted file mode 100755 index 43854ab14..000000000 --- a/alpine/docker-start +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -## -# For volume mounts... -## -chown -R frr:frr /etc/frr -/etc/init.d/frr start -exec sleep 10000d |