From b9838291b211a026baf0dfcfd1e1a65c6b232f0e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 27 Jan 2017 21:32:20 +0000 Subject: [PATCH] Push fwatchdog to 0.03-alpha and update --- TestDrive.md | 2 -- docker-compose.yml | 2 +- sample-functions/AlpineFunction/Dockerfile | 2 +- sample-functions/CaptainsIntent/Dockerfile | 2 +- sample-functions/ChangeColorIntent/Dockerfile | 2 +- sample-functions/DockerHubStats/Dockerfile | 2 +- sample-functions/DockerHubStats/build.sh | 3 +++ sample-functions/HostnameIntent/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile | 2 +- sample-functions/NodeInfo/build.sh | 3 +++ sample-functions/WebhookStash/Dockerfile | 3 ++- sample-functions/WebhookStash/build.sh | 3 +++ sample-functions/catservice/Dockerfile | 2 +- 13 files changed, 19 insertions(+), 11 deletions(-) create mode 100755 sample-functions/DockerHubStats/build.sh create mode 100755 sample-functions/NodeInfo/build.sh create mode 100755 sample-functions/WebhookStash/build.sh diff --git a/TestDrive.md b/TestDrive.md index 69407d7d..d82f7fcc 100644 --- a/TestDrive.md +++ b/TestDrive.md @@ -18,8 +18,6 @@ This one-shot script clones the code, initialises Docker swarm mode and then dep # docker swarm init --advertise-addr=$(ifconfig eth0| grep 'inet addr:'| cut -d: -f2 | awk '{ print $1}') && \ git clone https://github.com/alexellis/faas && \ cd faas && \ - git checkout labels_metrics && \ - (cd gateway && ./build.sh) && \ ./deploy_stack.sh && \ docker service ls ``` diff --git a/docker-compose.yml b/docker-compose.yml index 0dda03fd..8c41d872 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock" ports: - 8080:8080 - image: alexellis2/faas-gateway:latest-dev3 + image: alexellis2/faas-gateway:latest networks: - functions deploy: diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile index bbb83675..1c245f48 100644 --- a/sample-functions/AlpineFunction/Dockerfile +++ b/sample-functions/AlpineFunction/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog # Populate example here diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index 2a96cd1b..76563499 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk --update add nodejs -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index 54450d36..5a083c07 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk --update add nodejs -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile index 7586cc92..0f87ecb2 100644 --- a/sample-functions/DockerHubStats/Dockerfile +++ b/sample-functions/DockerHubStats/Dockerfile @@ -8,7 +8,7 @@ COPY . /go/src/github.com/alexellis/faas/sample-functions/DockerHubStats RUN make -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV fprocess "/go/bin/DockerHubStats" diff --git a/sample-functions/DockerHubStats/build.sh b/sample-functions/DockerHubStats/build.sh new file mode 100755 index 00000000..d855b946 --- /dev/null +++ b/sample-functions/DockerHubStats/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker build -t alexellis2/faas-hubstats . diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile index 0c934127..32c3963d 100644 --- a/sample-functions/HostnameIntent/Dockerfile +++ b/sample-functions/HostnameIntent/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk --update add nodejs -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index b44946be..f14a61cc 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk --update add nodejs -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog COPY package.json . diff --git a/sample-functions/NodeInfo/build.sh b/sample-functions/NodeInfo/build.sh new file mode 100755 index 00000000..5f0a4578 --- /dev/null +++ b/sample-functions/NodeInfo/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker build -t alexellis2/faas-nodeinfo . diff --git a/sample-functions/WebhookStash/Dockerfile b/sample-functions/WebhookStash/Dockerfile index 9816f297..3ae9c48d 100644 --- a/sample-functions/WebhookStash/Dockerfile +++ b/sample-functions/WebhookStash/Dockerfile @@ -5,7 +5,8 @@ WORKDIR /go/src/app RUN go get -d -v RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app . -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin + +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog # COPY fwatchdog /usr/bin/ diff --git a/sample-functions/WebhookStash/build.sh b/sample-functions/WebhookStash/build.sh new file mode 100755 index 00000000..e7cda971 --- /dev/null +++ b/sample-functions/WebhookStash/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker build -t alexellis2/faas-webhookstash . diff --git a/sample-functions/catservice/Dockerfile b/sample-functions/catservice/Dockerfile index 24b37abd..e91be1ef 100644 --- a/sample-functions/catservice/Dockerfile +++ b/sample-functions/catservice/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest ENTRYPOINT [] -ADD https://github.com/alexellis/faas/releases/download/v0.1-alpha/fwatchdog /usr/bin +ADD https://github.com/alexellis/faas/releases/download/v0.3-alpha/fwatchdog /usr/bin RUN chmod +x /usr/bin/fwatchdog ENV fprocess "/bin/cat"