diff --git a/Dockerfile b/Dockerfile index 9aae15f4a..54aff0e41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,5 @@ FROM alpine:latest LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts . COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-control-loop . -COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-reconciler . COPY script/install-cni.sh . CMD ["/install-cni.sh"] diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index e57205caf..11ec5a257 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -13,6 +13,5 @@ FROM arm64v8/alpine:latest LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts . COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-control-loop . -COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-reconciler . COPY script/install-cni.sh . CMD ["/install-cni.sh"] diff --git a/Dockerfile.openshift b/Dockerfile.openshift index b58fc3c49..7a8256918 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -5,15 +5,13 @@ WORKDIR /go/src/github.com/k8snetworkplumbingwg/whereabouts ENV CGO_ENABLED=1 ENV GO111MODULE=on RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go -RUN go build -mod vendor -o bin/ip-reconciler cmd/reconciler/ip.go cmd/reconciler/errors.go -RUN go build -mod vendor -o bin/ip-control-loop cmd/controlloop/main.go +RUN go build -mod vendor -o bin/ip-control-loop cmd/controlloop/controlloop.go WORKDIR / FROM openshift/origin-base RUN mkdir -p /usr/src/whereabouts/images && \ mkdir -p /usr/src/whereabouts/bin COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts /usr/src/whereabouts/bin -COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-reconciler /usr/src/whereabouts/bin COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-control-loop /usr/src/whereabouts/bin LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts