Skip to content
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

WIP: Embed rhcos*.json as /bootimage/rhcos*.json in container image #4102

Closed
wants to merge 1 commit into from
Closed

WIP: Embed rhcos*.json as /bootimage/rhcos*.json in container image #4102

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
2 changes: 2 additions & 0 deletions images/installer-artifacts/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ RUN go generate ./data && \

FROM registry.svc.ci.openshift.org/ocp/4.1:installer
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install
# Temporary (ideally 4.6 only) place for https://github.com/openshift/enhancements/pull/201#issuecomment-665183467
COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos*.json /bootimage/
2 changes: 2 additions & 0 deletions images/installer/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ RUN hack/build.sh

FROM registry.svc.ci.openshift.org/origin/4.1:base
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
# Temporary (ideally 4.6 only) place for https://github.com/openshift/enhancements/pull/201#issuecomment-665183467
COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos*.json /bootimage/
RUN mkdir /output && chown 1000:1000 /output
USER 1000:1000
ENV PATH /bin
Expand Down