diff --git a/images/coredns.yml b/images/coredns.yml index f172179a93..ffc553f976 100644 --- a/images/coredns.yml +++ b/images/coredns.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.openshift.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.openshift.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/csi-attacher.yml b/images/csi-attacher.yml index 487fa6c03e..b22bbff532 100644 --- a/images/csi-attacher.yml +++ b/images/csi-attacher.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.openshift.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.openshift.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/csi-livenessprobe.yml b/images/csi-livenessprobe.yml index aa10338ed6..6b909d1fb4 100644 --- a/images/csi-livenessprobe.yml +++ b/images/csi-livenessprobe.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.openshift.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.openshift.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/openshift-enterprise-ansible-operator.yml b/images/openshift-enterprise-ansible-operator.yml index e12894fd1f..e5b324e022 100644 --- a/images/openshift-enterprise-ansible-operator.yml +++ b/images/openshift-enterprise-ansible-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: release/ansible/Dockerfile.rhel8 + dockerfile: release/ansible/Dockerfile.ocp + dockerfile_fallback: release/ansible/Dockerfile.rhel8 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/openshift-enterprise-cluster-capacity.yml b/images/openshift-enterprise-cluster-capacity.yml index 31413ba181..e7c00e15ef 100644 --- a/images/openshift-enterprise-cluster-capacity.yml +++ b/images/openshift-enterprise-cluster-capacity.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: images/cluster-capacity/Dockerfile.rhel7 + dockerfile: images/cluster-capacity/Dockerfile.ocp + dockerfile_fallback: images/cluster-capacity/Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/openshift-enterprise-console-operator.yml b/images/openshift-enterprise-console-operator.yml index e909274930..5c524b3f7a 100644 --- a/images/openshift-enterprise-console-operator.yml +++ b/images/openshift-enterprise-console-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/openshift-enterprise-registry.yml b/images/openshift-enterprise-registry.yml index 4e815f0578..373eef729b 100644 --- a/images/openshift-enterprise-registry.yml +++ b/images/openshift-enterprise-registry.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-aws-pod-identity-webhook.yml b/images/ose-aws-pod-identity-webhook.yml index 41f15dad6c..7f1bd9b45c 100644 --- a/images/ose-aws-pod-identity-webhook.yml +++ b/images/ose-aws-pod-identity-webhook.yml @@ -3,7 +3,8 @@ arches: - aarch64 content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-cluster-config-api.yml b/images/ose-cluster-config-api.yml index 97dd0dbe3a..7e4b91106c 100644 --- a/images/ose-cluster-config-api.yml +++ b/images/ose-cluster-config-api.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel8 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel8 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-cluster-config-operator.yml b/images/ose-cluster-config-operator.yml index eee3a99c2e..4b157d6dc4 100644 --- a/images/ose-cluster-config-operator.yml +++ b/images/ose-cluster-config-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-cluster-csi-snapshot-controller-operator.yml b/images/ose-cluster-csi-snapshot-controller-operator.yml index 8bb3c778c1..0f939bc991 100644 --- a/images/ose-cluster-csi-snapshot-controller-operator.yml +++ b/images/ose-cluster-csi-snapshot-controller-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-cluster-kube-apiserver-operator.yml b/images/ose-cluster-kube-apiserver-operator.yml index e1597ff837..c8095a9604 100644 --- a/images/ose-cluster-kube-apiserver-operator.yml +++ b/images/ose-cluster-kube-apiserver-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-cluster-kube-controller-manager-operator.yml b/images/ose-cluster-kube-controller-manager-operator.yml index ac9c1c50c4..df5d940e28 100644 --- a/images/ose-cluster-kube-controller-manager-operator.yml +++ b/images/ose-cluster-kube-controller-manager-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-cluster-kube-scheduler-operator.yml b/images/ose-cluster-kube-scheduler-operator.yml index 207ef16e7b..553a9c1f4f 100644 --- a/images/ose-cluster-kube-scheduler-operator.yml +++ b/images/ose-cluster-kube-scheduler-operator.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-must-gather.yml b/images/ose-must-gather.yml index 58b0be3559..c1c3b30818 100644 --- a/images/ose-must-gather.yml +++ b/images/ose-must-gather.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ose-oauth-apiserver.yml b/images/ose-oauth-apiserver.yml index 05c0bdd531..eaab11e1e0 100644 --- a/images/ose-oauth-apiserver.yml +++ b/images/ose-oauth-apiserver.yml @@ -1,6 +1,7 @@ content: source: - dockerfile: images/Dockerfile.rhel7 + dockerfile: images/Dockerfile.ocp + dockerfile_fallback: images/Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ptp-operator-must-gather.yml b/images/ptp-operator-must-gather.yml index b6bc2baf1c..d429094761 100644 --- a/images/ptp-operator-must-gather.yml +++ b/images/ptp-operator-must-gather.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/ptp-operator.yml b/images/ptp-operator.yml index 8170e79328..a30112207b 100644 --- a/images/ptp-operator.yml +++ b/images/ptp-operator.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/sriov-dp-admission-controller.yml b/images/sriov-dp-admission-controller.yml index 626b5551a4..befb304944 100644 --- a/images/sriov-dp-admission-controller.yml +++ b/images/sriov-dp-admission-controller.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/sriov-network-config-daemon.yml b/images/sriov-network-config-daemon.yml index 2fa2b5a8c4..eb3f30d4ab 100644 --- a/images/sriov-network-config-daemon.yml +++ b/images/sriov-network-config-daemon.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.sriov-network-config-daemon.rhel7 + dockerfile: Dockerfile.sriov-network-config-daemon.ocp + dockerfile_fallback: Dockerfile.sriov-network-config-daemon.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/sriov-network-device-plugin.yml b/images/sriov-network-device-plugin.yml index ec3d66fe26..160d0c61c4 100644 --- a/images/sriov-network-device-plugin.yml +++ b/images/sriov-network-device-plugin.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/sriov-network-operator.yml b/images/sriov-network-operator.yml index 99c44b5666..0c50c67f99 100644 --- a/images/sriov-network-operator.yml +++ b/images/sriov-network-operator.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.rhel7 + dockerfile: Dockerfile.ocp + dockerfile_fallback: Dockerfile.rhel7 git: branch: target: release-{MAJOR}.{MINOR} diff --git a/images/sriov-network-webhook.yml b/images/sriov-network-webhook.yml index b3177a0761..6c70387c7c 100644 --- a/images/sriov-network-webhook.yml +++ b/images/sriov-network-webhook.yml @@ -4,7 +4,8 @@ arches: - ppc64le content: source: - dockerfile: Dockerfile.webhook.rhel7 + dockerfile: Dockerfile.webhook.ocp + dockerfile_fallback: Dockerfile.webhook.rhel7 git: branch: target: release-{MAJOR}.{MINOR}