Post-merge fixes

* Reinstate Windows build
* Mention Dockerfile --lang type in help
* Validate that "lang" is passed in YAML
* Add vendoring packages for Windows

Signed-off-by: Alex Ellis <[email protected]>

.gitignore

@@ -4,6 +4,7 @@ faas-cli
 !contrib/bash/faas-cli
 faas-cli-darwin
 faas-cli-armhf
+faas-cli.exe
 
 *.jpg
 *.pyc

Dockerfile.redist

@@ -5,17 +5,19 @@ COPY . .
 RUN go get -d -v
 
 RUN GIT_COMMIT=$(git rev-list -1 HEAD) \
- && GOARCH=arm GOARM=6 CGO_ENABLED=0 GOOS=linux go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli-armhf . \
- && CGO_ENABLED=0 GOOS=darwin go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli-darwin \
- && CGO_ENABLED=0 GOOS=linux go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli .
+ && GOARCH=arm GOARM=6 CGO_ENABLED=0 GOOS=linux go build --ldflags "-X commands.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli-armhf \
+ && CGO_ENABLED=0 GOOS=darwin go build --ldflags "-X commands.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli-darwin \
+ && CGO_ENABLED=0 GOOS=linux go build --ldflags "-X commands.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli \
+ && CGO_ENABLED=0 GOOS=windows go build --ldflags "-X commands.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli.exe
 
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
 
 WORKDIR /root/
 
-COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli    .
-COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-darwin    .
-COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-armhf    .
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli                .
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-darwin         .
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-armhf          .
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli.exe            .
 
 CMD ["./faas"]

build_redist.sh

@@ -5,4 +5,5 @@ docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_p
  docker cp faas-cli:/root/faas-cli . && \
  docker cp faas-cli:/root/faas-cli-darwin . && \
  docker cp faas-cli:/root/faas-cli-armhf . && \
+ docker cp faas-cli:/root/faas-cli.exe . && \
  docker rm -f faas-cli

commands/build.go

@@ -43,7 +43,7 @@ var buildCmd = &cobra.Command{
   faas-cli build --image IMAGE_NAME
                  --handler HANDLER_DIR
                  --name FUNCTION_NAME
-                 [--lang <ruby|python|python-armf|node|node-armf|csharp>]
+                 [--lang <ruby|python|python-armf|node|node-armf|csharp|Dockerfile>]
                  [--no-cache] [--squash]`,
 	Short: "Builds OpenFaaS function containers",
 	Long: `Builds OpenFaaS function containers either via the supplied YAML config using
@@ -83,6 +83,11 @@ func runBuild(cmd *cobra.Command, args []string) {
 				function.Name = k
 				// fmt.Println(k, function)
 				fmt.Printf("Building: %s.\n", function.Name)
+				if len(function.Language) == 0 {
+					fmt.Println("Please provide a valid -lang or 'Dockerfile' for your function.")
+					return
+				}
+
 				builder.BuildImage(function.Image, function.Handler, function.Name, function.Language, nocache, squash)
 			}
 		}