Skip to content

Commit 3a580b0

Browse files
committed
modify the Dockerfile.ci to build and ship node-joiner tool, along with the required dependencies (nmstate and oc)
1 parent 5d5fe31 commit 3a580b0

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

images/installer/Dockerfile.ci

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@ COPY . .
1212
COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
1313
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
1414
RUN go run -mod=vendor hack/build-coreos-manifest.go
15+
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build-node-joiner.sh
1516

17+
FROM registry.ci.openshift.org/ocp/4.16:cli-artifacts AS tools
1618

1719
FROM registry.ci.openshift.org/ocp/4.16:base
1820
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
1921
COPY --from=builder /go/src/github.com/openshift/installer/bin/manifests/ /manifests/
22+
# node-joiner requirements
23+
COPY --from=builder /go/src/github.com/openshift/installer/bin/node-joiner /bin/node-joiner
24+
COPY --from=tools /usr/bin/oc /bin/oc
25+
RUN dnf install -y nmstate
26+
2027
RUN mkdir /output && chown 1000:1000 /output
2128
USER 1000:1000
2229
ENV PATH /bin

0 commit comments

Comments
 (0)