From 1c2817c834e5b2fc9d151065a90369d7f321d10a Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Thu, 28 Dec 2017 19:17:59 +0000 Subject: [PATCH] Delete old shell scripts Signed-off-by: Alex Ellis --- sample-functions/AlpineFunction/build.armhf.sh | 2 +- sample-functions/NodeInfo/Dockerfile | 2 ++ sample-functions/NodeInfo/Dockerfile.func | 3 --- sample-functions/NodeInfo/build.armhf.sh | 2 +- sample-functions/NodeInfo/build.func.sh | 3 --- sample-functions/NodeInfo/handler.js | 1 + sample-functions/NodeInfo/main.js | 1 + sample-functions/build_all.sh | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 sample-functions/NodeInfo/Dockerfile.func delete mode 100755 sample-functions/NodeInfo/build.func.sh diff --git a/sample-functions/AlpineFunction/build.armhf.sh b/sample-functions/AlpineFunction/build.armhf.sh index 47c35dfa..81d28469 100755 --- a/sample-functions/AlpineFunction/build.armhf.sh +++ b/sample-functions/AlpineFunction/build.armhf.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh docker build -f Dockerfile.armhf -t functions/alpine:latest-armhf . diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index bc8ef9ec..fcd8932e 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -7,6 +7,8 @@ RUN chmod +x /usr/bin/fwatchdog COPY package.json . COPY main.js . + RUN npm i + ENV fprocess="node main.js" CMD ["fwatchdog"] diff --git a/sample-functions/NodeInfo/Dockerfile.func b/sample-functions/NodeInfo/Dockerfile.func deleted file mode 100644 index 6854ea19..00000000 --- a/sample-functions/NodeInfo/Dockerfile.func +++ /dev/null @@ -1,3 +0,0 @@ -FROM functions/nodebase:alpine-6.9.1 - -COPY handler.js . diff --git a/sample-functions/NodeInfo/build.armhf.sh b/sample-functions/NodeInfo/build.armhf.sh index d04fb667..64e2ad10 100755 --- a/sample-functions/NodeInfo/build.armhf.sh +++ b/sample-functions/NodeInfo/build.armhf.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh docker build -f Dockerfile.armhf -t functions/nodeinfo:latest-armhf . diff --git a/sample-functions/NodeInfo/build.func.sh b/sample-functions/NodeInfo/build.func.sh deleted file mode 100755 index 262ef55f..00000000 --- a/sample-functions/NodeInfo/build.func.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker build -t functions/nodeinfo:func . -f Dockerfile.func diff --git a/sample-functions/NodeInfo/handler.js b/sample-functions/NodeInfo/handler.js index 77ba8b2d..7f41bb7f 100644 --- a/sample-functions/NodeInfo/handler.js +++ b/sample-functions/NodeInfo/handler.js @@ -4,6 +4,7 @@ let fs = require('fs'); let util = require('util'); module.exports = (content, callback) => { + fs.readFile("/etc/hostname", "utf8", (err, data) => { let val = ""; val += "Hostname: " + data +"\n"; diff --git a/sample-functions/NodeInfo/main.js b/sample-functions/NodeInfo/main.js index 37ae7864..69ab5a75 100644 --- a/sample-functions/NodeInfo/main.js +++ b/sample-functions/NodeInfo/main.js @@ -5,6 +5,7 @@ let fs = require('fs'); const getStdin = require('get-stdin'); getStdin().then((content) => { + fs.readFile("/etc/hostname", "utf8", (err, data) => { console.log("Hostname: " + data); console.log("Platform: " + os.platform()); diff --git a/sample-functions/build_all.sh b/sample-functions/build_all.sh index ef66154f..591f2748 100755 --- a/sample-functions/build_all.sh +++ b/sample-functions/build_all.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh faas-cli build -f samples.yml --parallel 4