tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `make protos` 

The base target for protos was missing goimports, which we run after
making protos so that the linter doesn't fail on generated code
This commit is contained in:
Djordje Lukic 2020-05-14 21:53:14 +02:00
parent 03095e5796
commit a506b7f4e9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -7,8 +7,6 @@ ARG TARGET_ARCH=unknown
ARG PWD=/api ARG PWD=/api
ENV GO111MODULE=on ENV GO111MODULE=on
RUN go get github.com/golang/protobuf/protoc-gen-go@v1.4.1
WORKDIR ${PWD} WORKDIR ${PWD}
ADD go.* ${PWD} ADD go.* ${PWD}
ADD . ${PWD} ADD . ${PWD}
@ -23,7 +21,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
protobuf-compiler \ protobuf-compiler \
libprotobuf-dev libprotobuf-dev
RUN go get github.com/golang/protobuf/protoc-gen-go@v1.4.1 RUN go get github.com/golang/protobuf/protoc-gen-go@v1.4.1 && \
go get golang.org/x/tools/cmd/goimports
WORKDIR ${PWD} WORKDIR ${PWD}
ADD go.* ${PWD} ADD go.* ${PWD}

3
context/store/store_test.go
View File

@ -33,9 +33,10 @@ import (
"os" "os"
"testing" "testing"
"github.com/docker/api/errdefs"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/docker/api/errdefs"
) )
type StoreTestSuite struct { type StoreTestSuite struct {