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

Jump to bottom

Bug 1872080: Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config #762

Merged
merged 1 commit into from
Aug 30, 2020
Merged

Bug 1872080: Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config #762

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/openshift/cluster-network-operator
COPY . .
RUN hack/build-go.sh; \
mkdir -p /tmp/build; \
cp /go/src/github.com/openshift/cluster-network-operator/_output/linux/$(go env GOARCH)/cluster-network-operator /tmp/build/; \
cp /go/src/github.com/openshift/cluster-network-operator/_output/linux/$(go env GOARCH)/cluster-network-renderer /tmp/build/

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /tmp/build/cluster-network-operator /usr/bin/
COPY --from=builder /tmp/build/cluster-network-renderer /usr/bin/
COPY manifests /manifests
Expand Down