Skip to content

Commit 32204c0

Browse files
committed
Dockerfile.rhel: Use a RHEL-version-agnostic filename
So we don't have a nominally-rhel7 Dockerfile building RHEL 8 images and also so we don't need to manually bump this filename when we bump RHEL versions. We've had a RHEL 8 base since a4044f4 (Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config, 2020-08-24, #442). Once consumers have updated, we can remove the backwards-compat symlink.
1 parent 00aa243 commit 32204c0

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

Dockerfile.rhel

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
2+
WORKDIR /go/src/github.com/openshift/cluster-version-operator
3+
COPY . .
4+
RUN hack/build-go.sh; \
5+
mkdir -p /tmp/build; \
6+
cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator
7+
8+
FROM registry.svc.ci.openshift.org/ocp/4.6:base
9+
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
10+
COPY install /manifests
11+
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
12+
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml /manifests/
13+
COPY bootstrap /bootstrap
14+
ENTRYPOINT ["/usr/bin/cluster-version-operator"]

Dockerfile.rhel7

Lines changed: 0 additions & 14 deletions
This file was deleted.

Dockerfile.rhel7

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dockerfile.rhel

0 commit comments

Comments
 (0)