Skip to content

Commit 260ce49

Browse files
author
Jeff Peeler
committed
fix(build): remove dep usage
1 parent 2d18fa6 commit 260ce49

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ RUN make static
1818
# copy and build vendored grpc_health_probe
1919
RUN 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

2625
FROM openshift/origin-base

configmap-registry.Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ RUN make static
1212
FROM golang:1.10-alpine as probe-builder
1313

1414
RUN apk update && apk add build-base git
15-
RUN go get -u github.com/golang/dep/cmd/dep
1615
ENV ORG github.com/grpc-ecosystem
1716
ENV PROJECT $ORG/grpc_health_probe
1817
WORKDIR /go/src/$PROJECT
1918

2019
COPY --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

2524
FROM scratch

upstream.Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ RUN ./bin/initializer -o ./bundles.db
1616
FROM golang:1.10-alpine as probe-builder
1717

1818
RUN apk update && apk add build-base git
19-
RUN go get -u github.com/golang/dep/cmd/dep
2019
ENV ORG github.com/grpc-ecosystem
2120
ENV PROJECT $ORG/grpc_health_probe
2221
WORKDIR /go/src/$PROJECT
2322

2423
COPY --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

2827
FROM scratch
2928
COPY --from=builder /build/bundles.db /bundles.db

0 commit comments

Comments
 (0)