Skip to content

AGENT-863: fix oc dependency in installer images #8326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 29, 2024
Merged

AGENT-863: fix oc dependency in installer images #8326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions images/baremetal/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ 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

Expand All @@ -20,8 +18,7 @@ RUN dnf upgrade -y && \

# 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 dnf install -y nmstate openshift-clients

RUN mkdir /output && chown 1000:1000 /output
USER 1000:1000
Expand Down
5 changes: 0 additions & 5 deletions images/installer/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,9 @@ COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terr
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
RUN go run -mod=vendor hack/build-coreos-manifest.go

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/
# Required to run agent-based installer from the container
COPY --from=tools /usr/bin/oc /bin/oc
RUN dnf install -y nmstate

RUN mkdir /output && chown 1000:1000 /output
USER 1000:1000
Expand Down