Adapt dockerfiles to work in both OKD and OCP #316
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
approved
dulek
force-pushed
the
openshift-master
branch
from
5c4f658
to
f445cfd
Compare
A decision was made to force using the same dockerfiles for containers in both OKD and OCP. As those use two distinct buildsystems and the OKD one doesn't handle RPMs well, we had the files separated with the OKD one having a hack to enable repo with RPMs built by the build. This commit attempts to unify the files in order to use just a single one. That's done by trying to enable missing repo using sed which will work for OKD. In order to make it run fine in OCP result of that operation is simply ignored. Change-Id: I49a423ffae372b7d8259faf256c68e48324a1b53
dulek
force-pushed
the
openshift-master
branch
from
f445cfd
to
757b99e
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dulek, MaysaMacedo 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 |
|
/test images |
1 similar comment
|
/test images |
MaysaMacedo
pushed a commit
to MaysaMacedo/kuryr-kubernetes-1
that referenced
this pull request
Jul 1, 2021
Bug 1752905: Kuryr: Allow usage of SCC's to allow pod update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A decision was made to force using the same dockerfiles for containers
in both OKD and OCP. As those use two distinct buildsystems and the OKD
one doesn't handle RPMs well, we had the files separated with the OKD
one having a hack to enable repo with RPMs built by the build.
This commit attempts to unify the files in order to use just a single
one. That's done by trying to enable missing repo using sed which will
work for OKD. In order to make it run fine in OCP result of that
operation is simply ignored.