summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Stark2018-03-17 17:13:29 +0000
committerDavid Stark2018-03-17 17:13:29 +0000
commit6a9c81530212eca9155d1b6d39c1e5c566311f18 (patch)
tree5211b667d931424e39c89e5d6145f6bc2e00a2a4
parent416b47fe379c079500604c193b5d5b41fdc87209 (diff)
downloadaur-6a9c81530212eca9155d1b6d39c1e5c566311f18.tar.gz
handing signals to dumb-init
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
-rwxr-xr-xwrapper-stamp-telepresence.sh2
-rwxr-xr-xwrapper-telepresence.sh2
4 files changed, 9 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2201f952ad..3a31e2ed92d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
pkgbase = telepresence
pkgdesc = Local development against a remote Kubernetes or OpenShift cluster - http://www.telepresence.io
pkgver = 0.75
- pkgrel = 13
+ pkgrel = 14
url = https://github.com/datawire/telepresence
arch = any
license = Apache
+ depends = curl
depends = conntrack-tools
depends = git
depends = python
diff --git a/PKGBUILD b/PKGBUILD
index a7777db620d..a71cfdc1c99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: David Stark <david@starkers.org>
pkgver=0.75
-pkgrel=13
+pkgrel=14
pkgname=telepresence
pkgdesc="Local development against a remote Kubernetes or OpenShift cluster - http://www.telepresence.io"
arch=('any')
@@ -10,6 +10,7 @@ url="https://github.com/datawire/telepresence"
makedepends=()
backup=()
depends=(
+ 'curl'
'conntrack-tools'
'git'
'python'
@@ -24,6 +25,8 @@ source=("https://github.com/datawire/telepresence/archive/${pkgver}.tar.gz")
md5sums=('SKIP')
build(){
+ curl -s "https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64" -o dumb-init
+ chmod +x dumb-init
cd "${srcdir}/${pkgname}-${pkgver}"
virtualenv --python=python3 telepresence-venv
telepresence-venv/bin/pip install -r dev-requirements.txt
@@ -37,6 +40,7 @@ package(){
mkdir -p "${pkgdir}/opt/telepresence/telepresence-venv"
rsync -ra "${srcdir}/${pkgname}-${pkgver}/telepresence-venv/" "${pkgdir}/opt/telepresence/telepresence-venv/"
+ install -Dm 755 "dumb-init" "${pkgdir}/opt/telepresence/dumb-init"
install -Dm 755 "../wrapper-telepresence.sh" "${pkgdir}/usr/bin/telepresence"
install -Dm 755 "../wrapper-stamp-telepresence.sh" "${pkgdir}/usr/bin/stamp-telepresence"
diff --git a/wrapper-stamp-telepresence.sh b/wrapper-stamp-telepresence.sh
index 10869caa4dc..31e85ff9625 100755
--- a/wrapper-stamp-telepresence.sh
+++ b/wrapper-stamp-telepresence.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/opt/telepresence/dumb-init /bin/sh
# wrap the virtualenv and extend $PATH to include telepresence
diff --git a/wrapper-telepresence.sh b/wrapper-telepresence.sh
index 11cadb5bfe1..bb625f81b91 100755
--- a/wrapper-telepresence.sh
+++ b/wrapper-telepresence.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/opt/telepresence/dumb-init /bin/sh
# wrap the virtualenv and extend $PATH to include telepresence