From 2efdf8291518bcefe779a70ec13d9bed27ffb68f Mon Sep 17 00:00:00 2001
From: c9s <yoan@maicoin.com>
Date: Thu, 17 Dec 2020 16:19:31 +0800
Subject: [PATCH] fix docker mod cache

---
 Dockerfile | 8 ++++++--
 Makefile   | 1 +
 README.md  | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0cf5f6b8b..859b3966c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,12 +3,16 @@ FROM golang:1.15-alpine3.12 AS builder
 RUN apk add --no-cache git ca-certificates gcc libc-dev pkgconfig
 # gcc is for github.com/mattn/go-sqlite3
 RUN go get -u github.com/c9s/goose/cmd/goose
-ADD . $GOPATH/src/github.com/c9s/bbgo
+# ADD . $GOPATH/src/github.com/c9s/bbgo
+# WORKDIR $GOPATH/src/github.com/c9s/bbgo
+
 WORKDIR $GOPATH/src/github.com/c9s/bbgo
 ARG GO_MOD_CACHE
+ENV WORKDIR=$GOPATH/src/github.com/c9s/bbgo
 ENV GOPATH_ORIG=$GOPATH
-ENV GOPATH=${GO_MOD_CACHE:+$PWD/$GO_MOD_CACHE}
+ENV GOPATH=${GO_MOD_CACHE:+$WORKDIR/$GO_MOD_CACHE}
 ENV GOPATH=${GOPATH:-$GOPATH_ORIG}
+ADD . .
 RUN go build -o $GOPATH_ORIG/bin/bbgo ./cmd/bbgo
 
 # Second stage container
diff --git a/Makefile b/Makefile
index f6b6435a4..8dc3ac61b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,5 +30,6 @@ dist: bin-dir bbgo-linux bbgo-darwin
 docker:
 	GOPATH=$(PWD)/.mod go mod download
 	docker build --build-arg GO_MOD_CACHE=.mod --tag yoanlin/bbgo .
+	bash -c "[[ -n $(DOCKER_TAG) ]] && docker tag yoanlin/bbgo yoanlin/bbgo:$(DOCKER_TAG)"
 
 .PHONY: dist
diff --git a/README.md b/README.md
index 685165dee..b2c8fe9e3 100644
--- a/README.md
+++ b/README.md
@@ -233,6 +233,14 @@ streambook.BindStream(stream)
 
 ## Helm Chart
 
+Prepare your docker image locally (you can also use the docker image from docker hub):
+
+```
+make docker DOCKER_TAG=1.16.0
+```
+
+The docker tag version number is from the file [Chart.yaml](charts/bbgo/Chart.yaml)
+
 Prepare your secret:
 
 ```