From 5a74e1b4342a44a9345db600dc7b35728adca047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 16:26:55 +0800 Subject: [PATCH 01/11] Update Dockerfile --- Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a11a330..495f4a7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,12 @@ ADD . /go/src/github.com/lifei6671/mindoc WORKDIR /go/src/github.com/lifei6671/mindoc RUN chmod +x start.sh - -RUN go get -d ./... && \ - go get github.com/mitchellh/gox && \ - gox -os "windows linux darwin" -arch amd64 +RUN go get -d ./... +RUN go get github.com/mitchellh/gox +RUN go gox -os "windows linux darwin" -arch amd64 +#RUN go get -d ./... && \ + #go get github.com/mitchellh/gox && \ + #gox -os "windows linux darwin" -arch amd64 -CMD ["./start.sh"] \ No newline at end of file +CMD ["./start.sh"] From 434f3a092d4055e34dfe79205a224f856b038a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 16:34:01 +0800 Subject: [PATCH 02/11] Update Dockerfile --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 495f4a7d..e246701d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,12 @@ ADD . /go/src/github.com/lifei6671/mindoc WORKDIR /go/src/github.com/lifei6671/mindoc RUN chmod +x start.sh -RUN go get -d ./... -RUN go get github.com/mitchellh/gox -RUN go gox -os "windows linux darwin" -arch amd64 -#RUN go get -d ./... && \ - #go get github.com/mitchellh/gox && \ - #gox -os "windows linux darwin" -arch amd64 +#RUN go get -d ./... +#RUN go get github.com/mitchellh/gox +#RUN go gox -os "windows linux darwin" -arch amd64 +RUN go get -d ./... && \ + go get github.com/mitchellh/gox && \ + gox -os "linux" -arch amd64 CMD ["./start.sh"] From 9a0b4de5c2be9f1b79352708fb0d012772c5f687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 16:41:00 +0800 Subject: [PATCH 03/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e246701d..149d5cec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.1-alpine +FROM golang:1.9 RUN apk add --update bash git make gcc From 359d77fafe67218477c2fe825a984e738a737555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 17:00:02 +0800 Subject: [PATCH 04/11] Update Dockerfile --- Dockerfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 149d5cec..1eca1aaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.9 +FROM golang:1.8.1-alpine RUN apk add --update bash git make gcc @@ -9,12 +9,10 @@ ADD . /go/src/github.com/lifei6671/mindoc WORKDIR /go/src/github.com/lifei6671/mindoc RUN chmod +x start.sh -#RUN go get -d ./... -#RUN go get github.com/mitchellh/gox -#RUN go gox -os "windows linux darwin" -arch amd64 + RUN go get -d ./... && \ - go get github.com/mitchellh/gox && \ - gox -os "linux" -arch amd64 - - + go get github.com/mitchellh/gox +RUN gox -h +RUN gox -os "windows linux darwin" -arch amd64 + CMD ["./start.sh"] From cd0dafc10692fbd5b644b07ad9130908d9b6fc5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 17:14:14 +0800 Subject: [PATCH 05/11] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1eca1aaa..844cc4b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ RUN chmod +x start.sh RUN go get -d ./... && \ go get github.com/mitchellh/gox -RUN gox -h -RUN gox -os "windows linux darwin" -arch amd64 +RUN ls +RUN gox -build-toolchain +RUN gox CMD ["./start.sh"] From c1b4001ba3c6ae93ca0276593af22a87c85689ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 17:19:16 +0800 Subject: [PATCH 06/11] Update Dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 844cc4b7..7391aba1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ RUN chmod +x start.sh RUN go get -d ./... && \ go get github.com/mitchellh/gox RUN ls -RUN gox -build-toolchain -RUN gox +RUN go build CMD ["./start.sh"] From 1db676a9e44a803db6ad6e644de36de84a3fae16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 17:24:27 +0800 Subject: [PATCH 07/11] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7391aba1..602b9e60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN chmod +x start.sh RUN go get -d ./... && \ go get github.com/mitchellh/gox -RUN ls -RUN go build +RUN glide update +RUN go build -ldflags "-w" CMD ["./start.sh"] From 20393ff0370dd561c8a69ec90192ed8962e2f3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 17:45:50 +0800 Subject: [PATCH 08/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 602b9e60..47683f62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN chmod +x start.sh RUN go get -d ./... && \ go get github.com/mitchellh/gox -RUN glide update +RUN brew install glide RUN go build -ldflags "-w" CMD ["./start.sh"] From a47cff56577a5e1e83807cb4a0637163c85ae8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 17:47:39 +0800 Subject: [PATCH 09/11] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 47683f62..3a949d30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN chmod +x start.sh RUN go get -d ./... && \ go get github.com/mitchellh/gox RUN brew install glide +RUN glide install RUN go build -ldflags "-w" CMD ["./start.sh"] From b302dc2634678ea7a082c0142f496fdbcc9e398d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 18:00:36 +0800 Subject: [PATCH 10/11] Update Dockerfile --- Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a949d30..92cfd4ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.1-alpine +FROM golang:1.8.3-alpine3.6 RUN apk add --update bash git make gcc @@ -10,10 +10,9 @@ WORKDIR /go/src/github.com/lifei6671/mindoc RUN chmod +x start.sh -RUN go get -d ./... && \ - go get github.com/mitchellh/gox -RUN brew install glide -RUN glide install -RUN go build -ldflags "-w" - +RUN go get -d ./... && \ + go get github.com/mitchellh/gox && \ + gox -os "windows linux darwin" -arch amd64 + + CMD ["./start.sh"] From 6455f10ef5aa0e0491dbebd55a5e14a90e6514dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E4=BA=AE?= Date: Wed, 21 Jun 2017 18:10:16 +0800 Subject: [PATCH 11/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92cfd4ea..1e0c6ca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.8.3-alpine3.6 -RUN apk add --update bash git make gcc +RUN apk add --update bash git make gcc g++ ADD . /go/src/github.com/lifei6671/mindoc