OCPBUILD-174: Clean Up Containerfiles #414
Conversation
Remove previous "dev"/rhel7 Dockerfiles, and replace them with an equivalent `Containerfile` based on ubi9. The `Containerfile` uses the suffix `.ubi` as opposed to a specific UBI/RHEL version number to support future upgrades to ubi10 and beyond. The Containerfile uses UBI images from `registry.access.redhat.com`, which does not require a pull secret. This makes it easy for any contributor to pick up and build. Created a separate Containerfile for OCP builds (`.ocp`), copying the current contents of `Dockerfile.rhel8`. This `Containerfile` uses images from the OpenShift CI system, which are only available to Red Hat employees. The `.rhel8` suffix was removed because it is a source of confusion for new contributors; OCP is currently based on RHEL9 images, and will switch to ubi10 at some point in the future. Signed-off-by: Adam Kaplan <[email protected]>
openshift-ci-robot
added
the
jira/valid-reference
|
@adambkaplan: This pull request references OCPBUILD-174 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: adambkaplan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
The `tree` package is not available in UBI's default package repos (BaseOS, AppStream). This package was added explicitly in OCP 3.10, as a means of ensuring that all OCP images declared their package dependencies up front, versus inheriting them from a common base image. Prior to this change in openshift/origin [1], the `builder` image was based off of a common "control plane" image, which probably had package dependencies that are not relevant to container image builds. It does not appear that `tree` is needed by this container image or its dependencies (s2i, buildah). Removing it reduces skew between the `ubi` image for local development, and the `ocp` image for CI and release. [1] openshift/origin@4333db3 Signed-off-by: Adam Kaplan <[email protected]>
|
/retest Unit test should pass now that #412 merged. |
|
@adambkaplan: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Remove previous "dev"/rhel7 Dockerfiles, and replace them with an equivalent
Containerfilebased on ubi9. TheContainerfileuses the suffix.ubias opposed to a specific UBI/RHEL version number to support future upgrades to ubi10 and beyond. The Containerfile uses UBI images fromregistry.access.redhat.com, which does not require a pull secret. This makes it easy for any contributor to pick up and build.Created a separate Containerfile for OCP builds (
.ocp), copying the current contents ofDockerfile.rhel8. ThisContainerfileuses images from the OpenShift CI system, which are only available to Red Hat employees. The.rhel8suffix was removed because it is a source of confusion for new contributors; OCP is currently based on RHEL9 images, and will switch to ubi10 at some point in the future.