Skip to content

Commit 6a823ad

Browse files
committedJan 9, 2020
fix(build): grpc-health-probe was not building properly in 1.13
1 parent 164d716 commit 6a823ad

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed
 

‎Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openshift/origin-release:golang-1.12 as builder
1+
FROM openshift/origin-release:golang-1.13 as builder
22

33
RUN yum update -y && \
44
yum install -y make git sqlite glibc-static openssl-static zlib-static && \
@@ -19,6 +19,7 @@ RUN make build
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 && \
2121
cp -R vendor/ /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
22+
rm -rf /go/src/github.com/grpc-ecosystem/grpc_health_probe/vendor/github.com/grpc-ecosystem/grpc-health-probe && \
2223
cd /go/src/github.com/grpc-ecosystem/grpc_health_probe && \
2324
CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
2425

@@ -32,7 +33,7 @@ COPY --from=builder /src/bin/registry-server /bin/registry-server
3233
COPY --from=builder /src/bin/configmap-server /bin/configmap-server
3334
COPY --from=builder /src/bin/appregistry-server /bin/appregistry-server
3435
COPY --from=builder /src/bin/opm /bin/opm
35-
COPY --from=builder /go/bin/grpc_health_probe /bin/grpc_health_probe
36+
COPY --from=builder /go/bin/grpc-health-probe /bin/grpc_health_probe
3637

3738
RUN chgrp -R 0 /registry && \
3839
chgrp -R 0 /dev && \

0 commit comments

Comments
 (0)
Please sign in to comment.