Skip to content

Commit

Permalink
Update fwatchdog to 0.6.1 and correct help message for "action" option
Browse files Browse the repository at this point in the history
Signed-off-by: Minh-Quan TRAN <[email protected]>
  • Loading branch information
itscaro authored and alexellis committed Aug 27, 2017
1 parent 454d79e commit 8ed839c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func main() {

flag.StringVar(&handler, "handler", "", "handler for function, i.e. handler.js")
flag.StringVar(&image, "image", "", "Docker image name to build")
flag.StringVar(&action, "action", "", "either build or deploy")
flag.StringVar(&action, "action", "", "Available actions: build, deploy, push, delete")
flag.StringVar(&functionName, "name", "", "give the name of your deployed function")
flag.StringVar(&gateway, "gateway", "http://localhost:8080", "gateway URI - i.e. http://localhost:8080")
flag.StringVar(&fprocess, "fprocess", "", "fprocess to be run by the watchdog")
Expand Down Expand Up @@ -177,7 +177,7 @@ func main() {
return
}
default:
fmt.Println("-action must be 'build', 'deploy' or 'push'.")
fmt.Println("-action must be 'build', 'deploy', 'push' or 'delete'.")
break
}
}
Expand Down
2 changes: 1 addition & 1 deletion template/csharp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM microsoft/dotnet:2.0-sdk

#ADD https://github.com/alexellis/faas/releases/download/0.6.0/fwatchdog /usr/bin
#ADD https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog /usr/bin
RUN apt-get update -qy \
&& apt-get install -qy curl ca-certificates --no-install-recommends \
&& echo "Pulling watchdog binary from Github." \
Expand Down
2 changes: 1 addition & 1 deletion template/node-armhf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM arm32v6/alpine:3.6
RUN apk add --no-cache nodejs nodejs-npm ca-certificates
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.0/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

Expand Down
2 changes: 1 addition & 1 deletion template/python-armhf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM armhf/python:2.7-alpine
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.0/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

Expand Down

0 comments on commit 8ed839c

Please sign in to comment.