diff --git a/Dockerfile b/Dockerfile index 9dba73228..05603617a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,17 @@ -FROM golang:1.6-alpine +FROM golang:1.7-alpine WORKDIR /go/src/app -ENV ALLOW_CONTAINER_ROOT=1 COPY . /go/src/app RUN \ apk add --no-cache git && \ go-wrapper download && \ - go-wrapper install && \ + go-wrapper install -ldflags "-X github.com/minio/minio/cmd.Version=2016-10-07T01:16:39Z -X github.com/minio/minio/cmd.ReleaseTag=RELEASE.2016-10-07T01-16-39Z -X github.com/minio/minio/cmd.CommitID=b06a514ce0cf10f1d4c8bbc7b5cdbd956c567ab9" && \ mkdir -p /export/docker && \ cp /go/src/app/docs/Docker.md /export/docker/ && \ rm -rf /go/pkg /go/src && \ apk del git EXPOSE 9000 -ENTRYPOINT ["go-wrapper", "run", "server"] +ENTRYPOINT ["go-wrapper", "run"] VOLUME ["/export"] -CMD ["/export"] diff --git a/cmd/main.go b/cmd/main.go index 578aefd70..057bc486c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -20,6 +20,7 @@ import ( "fmt" "os" "sort" + "strings" "github.com/minio/cli" "github.com/minio/mc/pkg/console" @@ -165,10 +166,13 @@ func Main() { // Do not print update messages, if quiet flag is set. if !globalQuiet { - // Do not print any errors in release update function. - noError := true - updateMsg := getReleaseUpdate(minioUpdateStableURL, noError) - if updateMsg.Update { + if strings.HasPrefix(ReleaseTag, "RELEASE.") && c.Args().Get(0) != "update" { + updateMsg, _, err := getReleaseUpdate(minioUpdateStableURL) + if err != nil { + // Ignore any errors during getReleaseUpdate(), possibly + // because of network errors. + return nil + } console.Println(updateMsg) } }