Merge pull request operator-framework#377 from njhale/vendor-grpc

fix(docker): build grpc probe outside of gopath

Author: openshift-merge-robot

Dockerfile

@@ -17,12 +17,7 @@ COPY Makefile go.mod go.sum ./
 RUN make build
 
 # copy and build vendored grpc_health_probe
-RUN mkdir -p /go/src/github.com/grpc-ecosystem && \
-    cp -R vendor/github.com/grpc-ecosystem/grpc-health-probe /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
-    cp -R vendor/ /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
-    rm -rf /go/src/github.com/grpc-ecosystem/grpc_health_probe/vendor/github.com/grpc-ecosystem/grpc-health-probe && \
-    cd /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
-    CGO_ENABLED=0 go install -mod=mod -a -tags netgo -ldflags "-w"
+RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/...
 
 FROM openshift/origin-base
 
@@ -34,7 +29,7 @@ COPY --from=builder /src/bin/registry-server /bin/registry-server
 COPY --from=builder /src/bin/configmap-server /bin/configmap-server
 COPY --from=builder /src/bin/appregistry-server /bin/appregistry-server
 COPY --from=builder /src/bin/opm /bin/opm
-COPY --from=builder /go/bin/grpc-health-probe /bin/grpc_health_probe
+COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe
 
 RUN chgrp -R 0 /registry && \
     chmod -R g+rwx /registry

go.mod

@@ -23,9 +23,9 @@ require (
 	github.com/gofrs/uuid v3.3.0+incompatible // indirect
 	github.com/golang-migrate/migrate/v4 v4.6.2
 	github.com/golang/mock v1.3.1
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.4.2
 	github.com/gorilla/handlers v1.4.2 // indirect
-	github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db
+	github.com/grpc-ecosystem/grpc-health-probe v0.3.2
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
 	github.com/onsi/ginkgo v1.12.0
@@ -44,9 +44,13 @@ require (
 	github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
 	go.etcd.io/bbolt v1.3.4
 	golang.org/x/mod v0.2.0
-	golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
+	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	google.golang.org/grpc v1.26.0
+	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
+	golang.org/x/text v0.3.3 // indirect
+	google.golang.org/genproto v0.0.0-20200701001935-0939c5918c31 // indirect
+	google.golang.org/grpc v1.30.0
+	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.18.2
 	k8s.io/apiextensions-apiserver v0.18.2