Skip to content
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.

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

Change the Dockerfile and Github workflow to support multiple platform builds #209

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Conversation

yiraeChristineKim
Copy link

@yiraeChristineKim yiraeChristineKim commented Apr 4, 2024

Change the Dockerfile and Github workflow to support multiple platform builds (arm64/v8, arm64, amd64) for the dev environment.

Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
@yiraeChristineKim yiraeChristineKim changed the title Add golang setup in build-push-stolostron Change the Dockerfile and Github workflow to support multiple platform builds Apr 5, 2024
Change the Dockerfile and workflow to support multiple platform builds (arm64/v8, arm64, amd64) for the dev environment.
Signed-off-by: yiraeChristineKim <[email protected]>
@yiraeChristineKim yiraeChristineKim requested a review from mprahl April 5, 2024 15:41
Copy link

openshift-ci bot commented Apr 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mprahl, yiraeChristineKim

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:
  • OWNERS [mprahl,yiraeChristineKim]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 1cd38b8 into stolostron:release-3.14 Apr 5, 2024
3 checks passed
@mprahl
Copy link

mprahl commented Apr 5, 2024

/cherry-pick release-3.15

@openshift-cherrypick-robot

@mprahl: #209 failed to apply on top of branch "release-3.15":

Applying: Change the Dockerfile and workflow to support multiple platform builds
.git/rebase-apply/patch:61: trailing whitespace.
   
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	.github/workflows/build-push-stolostron.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/build-push-stolostron.yaml
CONFLICT (content): Merge conflict in .github/workflows/build-push-stolostron.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Change the Dockerfile and workflow to support multiple platform builds
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-3.15

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.

@dhaiducek
Copy link

@mprahl I'll incorporate this update and force-push it to squash it into the "stolostron" commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants