Sync Calico node arm64 Dockerfile with amd64#8532
Merged
Conversation
This change syncs Calico node arm64 Dockerfile with amd64. It also removes an `ARCH` environment variable definition as it conflicts with the same variable defined in other Makefiles. Calico node Dockerfiles are architecture dependent so arch info are hard-coded now until we unify them.
marvin-tigera
added
release-note-required
3 tasks
hjiawei
commented
Feb 20, 2024
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| ARG ARCH=x86_64 |
Contributor
Author
There was a problem hiding this comment.
This environment variable conflicts with the same variable defined in Makefile.
hjiawei
commented
Feb 20, 2024
| # Now install libnftnl and libnftnl-devel | ||
| rpm -Uv /root/rpmbuild/RPMS/${ARCH}/libnftnl-${LIBNFTNL_VER}.el8.${ARCH}.rpm && \ | ||
| rpm -Uv /root/rpmbuild/RPMS/${ARCH}/libnftnl-devel-${LIBNFTNL_VER}.el8.${ARCH}.rpm && \ | ||
| rpm -Uv /root/rpmbuild/RPMS/x86_64/libnftnl-${LIBNFTNL_VER}.el8.x86_64.rpm && \ |
Contributor
Author
There was a problem hiding this comment.
Hard code arch info for now because this Dockerfile is arch dependent.
coutinhop
approved these changes
Feb 20, 2024
caseydavenport
added
docs-not-required
marvin-tigera
removed
release-note-required
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description
This change syncs Calico node arm64 Dockerfile with amd64. It also removes an
ARCHenvironment variable definition as it conflicts with the same variable defined in other Makefiles. Calico node Dockerfiles are architecture dependent so arch info are hard-coded now until we unify them.Related issues/PRs
Todos
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*label.docs-pr-required: This change requires a change to the documentation that has not been completed yet.docs-completed: This change has all necessary documentation completed.docs-not-required: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*label.release-note-required: This PR has user-facing changes. Most PRs should have this label.release-note-not-required: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.