From cfcb183bc7db77b177d9552535e2f3101fd59e63 Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Sat, 19 Aug 2017 14:21:20 +0100 Subject: [PATCH] Name builder steps Signed-off-by: Alex Ellis --- gateway/Dockerfile | 4 ++-- gateway/build.sh | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gateway/Dockerfile b/gateway/Dockerfile index 6a6d75ea..30dbe6b6 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.5 +FROM golang:1.7.5 as build WORKDIR /go/src/github.com/alexellis/faas/gateway COPY vendor vendor @@ -22,7 +22,7 @@ EXPOSE 8080 ENV http_proxy "" ENV https_proxy "" -COPY --from=0 /go/src/github.com/alexellis/faas/gateway/gateway . +COPY --from=build /go/src/github.com/alexellis/faas/gateway/gateway . COPY assets assets diff --git a/gateway/build.sh b/gateway/build.sh index b3168464..9e625a88 100755 --- a/gateway/build.sh +++ b/gateway/build.sh @@ -1,7 +1,14 @@ #!/bin/sh -export TAG="latest-dev" -echo Building functions/gateway:$TAG +export eTAG="latest-dev" +echo $1 +if [ $1 ] ; then + echo "set this" + eTAG=$1 +fi + +echo Building functions/gateway:$eTAG docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \ - -t functions/gateway:$TAG . + -t functions/gateway:$eTAG . +