Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pin all tools used in the Dockerfiles 

Also update gometalinter to use the official version. The update
found some new gosimple errors, which are fixed.

Also update the filewatcher script for the latest version of filewatcher.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-07-11 14:19:02 -04:00
parent 6908e58f0f
commit 102a8f0c9d
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/command/formatter/disk_usage.go
View File

@ -243,7 +243,7 @@ func (c *diskUsageImagesContext) Reclaimable() string {
if c.totalSize > 0 { if c.totalSize > 0 {
return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/c.totalSize) return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/c.totalSize)
} }
return fmt.Sprintf("%s", units.HumanSize(float64(reclaimable))) return units.HumanSize(float64(reclaimable))
} }
type diskUsageContainersContext struct { type diskUsageContainersContext struct {
@ -305,7 +305,7 @@ func (c *diskUsageContainersContext) Reclaimable() string {
return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/totalSize) return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/totalSize)
} }
return fmt.Sprintf("%s", units.HumanSize(float64(reclaimable))) return units.HumanSize(float64(reclaimable))
} }
type diskUsageVolumesContext struct { type diskUsageVolumesContext struct {
@ -366,7 +366,7 @@ func (c *diskUsageVolumesContext) Reclaimable() string {
return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/totalSize) return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/totalSize)
} }
return fmt.Sprintf("%s", units.HumanSize(float64(reclaimable))) return units.HumanSize(float64(reclaimable))
} }
type diskUsageBuilderContext struct { type diskUsageBuilderContext struct {

2
cli/command/formatter/stats.go
View File

@ -184,7 +184,7 @@ func (c *containerStatsContext) MemUsage() string {
return fmt.Sprintf("-- / --") return fmt.Sprintf("-- / --")
} }
if c.os == winOSType { if c.os == winOSType {
return fmt.Sprintf("%s", units.BytesSize(c.s.Memory)) return units.BytesSize(c.s.Memory)
} }
return fmt.Sprintf("%s / %s", units.BytesSize(c.s.Memory), units.BytesSize(c.s.MemoryLimit)) return fmt.Sprintf("%s / %s", units.BytesSize(c.s.Memory), units.BytesSize(c.s.MemoryLimit))
} }

18
dockerfiles/Dockerfile.dev
View File

@ -3,19 +3,25 @@ FROM golang:1.8.3-alpine
RUN apk add -U git make bash coreutils RUN apk add -U git make bash coreutils
ARG VNDR_COMMIT=9909bb2b8a0b7ea464527b376dc50389c90df587 ARG VNDR_SHA=9909bb2b8a0b7ea464527b376dc50389c90df587
RUN git clone https://github.com/LK4D4/vndr.git "/go/src/github.com/LK4D4/vndr" && \ RUN go get github.com/LK4D4/vndr && \
cd "/go/src/github.com/LK4D4/vndr" && \ cd /go/src/github.com/LK4D4/vndr && \
git checkout -q "$VNDR_COMMIT" && \ git checkout -q "$VNDR_SHA" && \
go build -v -o /usr/bin/vndr . && \ go build -v -o /usr/bin/vndr . && \
rm -rf /go/src/* /go/pkg/* /go/bin/* rm -rf /go/src/* /go/pkg/* /go/bin/*
ARG BINDATA_SHA=a0ff2567cfb70903282db057e799fd826784d41d
RUN go get github.com/jteeuwen/go-bindata/go-bindata && \ RUN go get github.com/jteeuwen/go-bindata/go-bindata && \
cp /go/bin/go-bindata /usr/bin && \ cd /go/src/github.com/jteeuwen/go-bindata/go-bindata && \
git checkout -q "$BINDATA_SHA" && \
go build -v -o /usr/bin/go-bindata . && \
rm -rf /go/src/* /go/pkg/* /go/bin/* rm -rf /go/src/* /go/pkg/* /go/bin/*
ARG FILEWATCHER_SHA=2e12ea42f6c8c089b19e992145bb94e8adaecedb
RUN go get github.com/dnephin/filewatcher && \ RUN go get github.com/dnephin/filewatcher && \
cp /go/bin/filewatcher /usr/bin/ && \ cd /go/src/github.com/dnephin/filewatcher && \
git checkout -q "$FILEWATCHER_SHA" && \
go build -v -o /usr/bin/filewatcher . && \
rm -rf /go/src/* /go/pkg/* /go/bin/* rm -rf /go/src/* /go/pkg/* /go/bin/*
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0

10
dockerfiles/Dockerfile.lint
View File

@ -2,9 +2,13 @@ FROM golang:1.8.3-alpine
RUN apk add -U git RUN apk add -U git
RUN go get -u gopkg.in/dnephin/gometalinter.v1 && \ ARG GOMETALINTER_SHA=b4ebfc554d8f36bfef1f180ad0aaaaac99b430d5
mv /go/bin/gometalinter.v1 /usr/local/bin/gometalinter && \ RUN go get github.com/alecthomas/gometalinter && \
gometalinter --install cd /go/src/github.com/alecthomas/gometalinter && \
git checkout -q "$GOMETALINTER_SHA" && \
go build -v -o /usr/local/bin/gometalinter . && \
gometalinter --install && \
rm -rf /go/src/* /go/pkg/*
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0

12
scripts/test/watch
View File

@ -1,12 +1,2 @@
#!/bin/sh #!/bin/sh
exec filewatcher -L 6 -x build -x script go test -timeout 10s -v './${dir}'
set -e
filewatcher \
-L 6 \
-x '**/*.swp' \
-x .git \
-x build \
-x .idea \
-- \
sh -c 'go test -timeout 10s -v ./${dir} || ( echo; echo; exit 1 )'