move the node-joiner binary into the baremetal-installer image

Author: andfasano

images/baremetal/Dockerfile.ci

@@ -6,7 +6,9 @@ ARG TAGS="baremetal fipscapable"
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
 RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
+RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build-node-joiner.sh
 
+FROM registry.ci.openshift.org/ocp/4.16:cli-artifacts AS tools
 
 FROM registry.ci.openshift.org/ocp/4.16:base
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
@@ -16,6 +18,11 @@ RUN dnf upgrade -y && \
     openssl unzip jq openssh-clients && \
     dnf clean all && rm -rf /var/cache/yum/*
 
+# node-joiner requirements
+COPY --from=builder /go/src/github.com/openshift/installer/bin/node-joiner /bin/node-joiner
+COPY --from=tools /usr/bin/oc /bin/oc
+RUN dnf install -y nmstate
+
 RUN mkdir /output && chown 1000:1000 /output
 USER 1000:1000
 ENV PATH /bin

images/installer/Dockerfile.ci

@@ -12,15 +12,13 @@ COPY . .
 COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
 RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 RUN go run -mod=vendor hack/build-coreos-manifest.go
-RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build-node-joiner.sh
 
 FROM registry.ci.openshift.org/ocp/4.16:cli-artifacts AS tools
 
 FROM registry.ci.openshift.org/ocp/4.16:base
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
 COPY --from=builder /go/src/github.com/openshift/installer/bin/manifests/ /manifests/
-# node-joiner requirements
-COPY --from=builder /go/src/github.com/openshift/installer/bin/node-joiner /bin/node-joiner
+# Required to run agent-based installer from the container
 COPY --from=tools /usr/bin/oc /bin/oc
 RUN dnf install -y nmstate