From 6230d3504eab437e6e87cfb79c9a76d5dc5c3ea5 Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Sat, 28 Dec 2019 16:09:02 +0000
Subject: [PATCH] Run faasd from /usr/local/bin

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 cmd/install.go                 |  5 +++++
 hack/build-containerd-armhf.sh | 28 ++++++++++++++++++++++++++++
 hack/build-containerd.sh       | 28 ++++++++++++++++++++++++++++
 hack/faasd.service             |  2 +-
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100755 hack/build-containerd-armhf.sh
 create mode 100644 hack/build-containerd.sh

diff --git a/cmd/install.go b/cmd/install.go
index 15059b15..62b812bf 100644
--- a/cmd/install.go
+++ b/cmd/install.go
@@ -23,6 +23,11 @@ func runInstall(_ *cobra.Command, _ []string) error {
 		return err
 	}
 
+	err := binExists("/usr/local/bin/", "faasd")
+	if err != nil {
+		return err
+	}
+
 	err = binExists("/usr/local/bin/", "netns")
 	if err != nil {
 		return err
diff --git a/hack/build-containerd-armhf.sh b/hack/build-containerd-armhf.sh
new file mode 100755
index 00000000..b626716f
--- /dev/null
+++ b/hack/build-containerd-armhf.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+echo "Downloading Go"
+
+curl -SLsf https://dl.google.com/go/go1.12.14.linux-armv6l.tar.gz > go.tgz
+sudo rm -rf /usr/local/go/
+sudo mkdir -p /usr/local/go/
+sudo tar -xvf go.tgz -C /usr/local/go/ --strip-components=1
+
+export GOPATH=$HOME/go/
+export PATH=$PATH:/usr/local/go/bin/
+
+go version
+
+echo "Building containerd"
+
+mkdir -p $GOPATH/src/github.com/containerd
+cd $GOPATH/src/github.com/containerd
+git clone https://github.com/containerd/containerd
+
+cd containerd
+git fetch origin --tags
+git checkout v1.3.2
+
+make
+sudo make install
+
+sudo containerd --version
diff --git a/hack/build-containerd.sh b/hack/build-containerd.sh
new file mode 100644
index 00000000..514e7a4a
--- /dev/null
+++ b/hack/build-containerd.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+echo "Downloading Go"
+
+curl -SLsf https://dl.google.com/go/go1.12.14.linux-amd64.tar.gz > go.tgz
+sudo rm -rf /usr/local/go/
+sudo mkdir -p /usr/local/go/
+sudo tar -xvf go.tgz -C /usr/local/go/ --strip-components=1
+
+export GOPATH=$HOME/go/
+export PATH=$PATH:/usr/local/go/bin/
+
+go version
+
+echo "Building containerd"
+
+mkdir -p $GOPATH/src/github.com/containerd
+cd $GOPATH/src/github.com/containerd
+git clone https://github.com/containerd/containerd
+
+cd containerd
+git fetch origin --tags
+git checkout v1.3.2
+
+make
+sudo make install
+
+sudo containerd --version
diff --git a/hack/faasd.service b/hack/faasd.service
index c09a735b..0cec4982 100644
--- a/hack/faasd.service
+++ b/hack/faasd.service
@@ -4,7 +4,7 @@ After=faas-containerd.service
 
 [Service]
 MemoryLimit=500M
-ExecStart={{.Cwd}}/faasd up
+ExecStart=/usr/local/bin/faasd up
 Restart=on-failure
 RestartSec=10s
 WorkingDirectory={{.Cwd}}