Skip to content

Remove ARG BUILDPLATFORM from Dockerfile #1379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 23, 2023
Merged

Remove ARG BUILDPLATFORM from Dockerfile #1379

merged 1 commit into from
Sep 23, 2023

Conversation

tyuchn
Copy link
Contributor

@tyuchn tyuchn commented Sep 23, 2023 •
edited
Loading

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
Unsetting BUILDPLATFORM as a build arg, because it's provided by docker automatically from the --platform flag. This will unblock the pdcsi louhi build.
Reference: https://docs.docker.com/build/guide/multi-platform/#build-using-cross-compilation
Tested locally with command GCE_PD_CSI_STAGING_IMAGE=gcr.io/tyuchn-joonix/pdcsi make build-and-push-multi-arch and GCE_PD_CSI_STAGING_IMAGE=gcr.io/tyuchn-joonix/pdcsi make build-and-push-multi-arch-debug
Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

N/A

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 23, 2023
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 23, 2023
@mattcary
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 23, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattcary, tyuchn

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 23, 2023
@k8s-ci-robot k8s-ci-robot merged commit 0c95526 into master Sep 23, 2023
@tyuchn
Copy link
Contributor Author

tyuchn commented Sep 25, 2023

/cherry-pick release-1.12

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 25, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@tyuchn: new pull request created: #1384

In response to this:

/cherry-pick release-1.12

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/test-infra repository.

@tyuchn
Copy link
Contributor Author

tyuchn commented Sep 25, 2023

/cherry-pick release-1.11

@tyuchn
Copy link
Contributor Author

tyuchn commented Sep 25, 2023

/cherry-pick release-1.10

@tyuchn
Copy link
Contributor Author

tyuchn commented Sep 25, 2023

/cherry-pick release-1.9

@tyuchn
Copy link
Contributor Author

tyuchn commented Sep 25, 2023

/cherry-pick release-1.8

@tyuchn
Copy link
Contributor Author

tyuchn commented Sep 25, 2023

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot
Copy link

@tyuchn: new pull request created: #1385

In response to this:

/cherry-pick release-1.11

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/test-infra repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 25, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@tyuchn: new pull request created: #1386

In response to this:

/cherry-pick release-1.10

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/test-infra repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 25, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@tyuchn: new pull request created: #1387

In response to this:

/cherry-pick release-1.9

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/test-infra repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 25, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@tyuchn: #1379 failed to apply on top of branch "release-1.8":

Applying: Remove ARG BUILDPLATFORM from Dockerfile
Using index info to reconstruct a base tree...
M	Dockerfile
M	Dockerfile.Windows
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile.Windows
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove ARG BUILDPLATFORM from Dockerfile
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

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/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@tyuchn: #1379 failed to apply on top of branch "release-1.7":

Applying: Remove ARG BUILDPLATFORM from Dockerfile
Using index info to reconstruct a base tree...
M	Dockerfile
M	Dockerfile.Windows
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile.Windows
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove ARG BUILDPLATFORM from Dockerfile
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

@tyuchn tyuchn mentioned this pull request Sep 25, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mauriciopoppe mauriciopoppe Awaiting requested review from mauriciopoppe

@mattcary mattcary Awaiting requested review from mattcary

Assignees

@mattcary mattcary

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tyuchn @mattcary @k8s-ci-robot @k8s-infra-cherrypick-robot