From 16baf4ec016d3aa4982368201b53172d8e34827c Mon Sep 17 00:00:00 2001 From: Avi Aryan Date: Fri, 23 Jun 2017 15:09:52 +0530 Subject: [PATCH] use build variant in docker building, fixes #31 --- Dockerfile | 11 ++++++++--- README.md | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb86f86..002ab54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # # abc Dockerfile -# docker build -t abc . +# docker build --build-arg ABC_BUILD=oss -t abc . # docker volume create --name abc -# docker run -i --rm -v abc:/root --name abc abc login google +# docker run -i --rm -v abc:/root abc login google # root is $HOME, -i for stdin, --rm to remove container # @@ -22,8 +22,13 @@ ADD . /go/src/github.com/appbaseio/abc # Define working directory WORKDIR /go/src/github.com/appbaseio/abc +# Get build variant +ARG ABC_BUILD=oss +ENV ABC_BUILD ${ABC_BUILD} + +# Run build RUN cd /go/src/github.com/appbaseio/abc && \ - go build ./cmd/abc/... + go build -tags $ABC_BUILD ./cmd/abc/... # Define default entrypoint # Entrypoint gets extra parameters from docker run diff --git a/README.md b/README.md index 1d87701..9d610d4 100755 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Note - You might be wondering what is the tag `oss` doing there. That's covered ```sh git clone https://github.com/appbaseio-confidential/abc cd abc -docker build -t abc . +docker build --build-arg ABC_BUILD=oss -t abc . docker volume create --name abc ``` -- GitLab