File tree Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -18,9 +18,8 @@ RUN make static
1818# copy and build vendored grpc_health_probe
1919RUN mkdir -p /go/src/github.com/grpc-ecosystem && \
2020 cp -R vendor/github.com/grpc-ecosystem/grpc-health-probe /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
21+ cp -R vendor/ /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
2122 cd /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
22- go get -u github.com/golang/dep/cmd/dep && \
23- dep ensure -vendor-only -v && \
2423 CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2524
2625FROM openshift/origin-base
Original file line number Diff line number Diff line change @@ -12,14 +12,13 @@ RUN make static
1212FROM golang:1.10-alpine as probe-builder
1313
1414RUN apk update && apk add build-base git
15- RUN go get -u github.com/golang/dep/cmd/dep
1615ENV ORG github.com/grpc-ecosystem
1716ENV PROJECT $ORG/grpc_health_probe
1817WORKDIR /go/src/$PROJECT
1918
2019COPY --from=builder /go/src/github.com/operator-framework/operator-registry/vendor/$ORG/grpc-health-probe .
21- RUN dep ensure -vendor-only -v && \
22- CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
20+ COPY --from=builder /go/src/github.com/operator-framework/operator-registry/vendor .
21+ RUN CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2322
2423
2524FROM scratch
Original file line number Diff line number Diff line change @@ -16,14 +16,13 @@ RUN ./bin/initializer -o ./bundles.db
1616FROM golang:1.10-alpine as probe-builder
1717
1818RUN apk update && apk add build-base git
19- RUN go get -u github.com/golang/dep/cmd/dep
2019ENV ORG github.com/grpc-ecosystem
2120ENV PROJECT $ORG/grpc_health_probe
2221WORKDIR /go/src/$PROJECT
2322
2423COPY --from=builder /build/vendor/$ORG/grpc-health-probe .
25- RUN dep ensure -vendor-only -v && \
26- CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
24+ COPY --from=builder /build/vendor .
25+ RUN CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2726
2827FROM scratch
2928COPY --from=builder /build/bundles.db /bundles.db
You can’t perform that action at this time.
0 commit comments