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.

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

feat: support arm64 #1391

Merged
merged 2 commits into from
Mar 7, 2020
Merged

feat: support arm64 #1391

merged 2 commits into from
Mar 7, 2020

Conversation

zhujian7
Copy link
Collaborator

What this PR does / why we need it:

Add your description

Which issue(s) this PR is related to (optional, link to 3rd issue(s)):

Fixes #

Reference to #

Special notes for your reviewer:

/cc @supereagle @hyy0322 @liwandaniel

Release note:

NONE

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 27, 2020
supereagle
supereagle reviewed Mar 1, 2020
View reviewed changes
build/web/Dockerfile.arm64.local Outdated
@@ -0,0 +1,6 @@
FROM arm64v8/nginx:1.14-alpine
LABEL maintainer="chende@caicloud.io"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update maintainer

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

build/workflow/controller/Dockerfile.arm64 Outdated
@@ -0,0 +1,9 @@
FROM arm64v8/alpine:3.8

LABEL maintainer="chende@caicloud.io"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

build/cicd/cd/Dockerfile.arm64 Outdated
@@ -0,0 +1,9 @@
FROM arm64v8/alpine:3.8

LABEL maintainer="chende@caicloud.io"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update maintainer

liwandaniel
liwandaniel reviewed Mar 5, 2020
View reviewed changes
build/cicd/sonarqube/Dockerfile.arm64 Outdated
@@ -0,0 +1,50 @@
FROM arm64v8/openjdk:8-alpine3.8

LABEL maintainer="Ryan Mitchell <mitch@ryansmitchell.com>"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里可以去掉

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PTAL

@supereagle
Copy link
Member

/lgtm

@supereagle
Copy link
Member

/lgtm

@caicloud-bot caicloud-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 7, 2020
@caicloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: supereagle

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

1 similar comment
@caicloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: supereagle

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

@caicloud-bot caicloud-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 7, 2020
@supereagle
Copy link
Member

/bark

@caicloud-bot
Copy link
Collaborator

@supereagle: dog image

In response to this:

/bark

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 caicloud/tools repository.

@caicloud-bot caicloud-bot merged commit 99a366b into caicloud:cps-2.8 Mar 7, 2020
@zhujian7
Copy link
Collaborator Author

/cherrypick cps-2.10

@caicloud-bot
Copy link
Collaborator

@zhujian7: #1391 failed to apply on top of branch "cps-2.10":

.git/rebase-apply/patch:162: trailing whitespace.
# ENTRYPOINT ["sonar-scanner"] 
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Patch failed at 0001 feat: support arm64

In response to this:

/cherrypick cps-2.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.

@zhujian7
Copy link
Collaborator Author

/cherrypick cps-2.10

@caicloud-bot caicloud-bot mentioned this pull request Jun 28, 2020
Merged
@caicloud-bot
Copy link
Collaborator

@zhujian7: new pull request created: #1449

In response to this:

/cherrypick cps-2.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.

@zhujian7
Copy link
Collaborator Author

/cherrypick master

@caicloud-bot caicloud-bot mentioned this pull request Jun 28, 2020
Merged
@caicloud-bot
Copy link
Collaborator

@zhujian7: new pull request created: #1450

In response to this:

/cherrypick master

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@supereagle supereagle supereagle left review comments

@liwandaniel liwandaniel liwandaniel left review comments

@hyy0322 hyy0322 Awaiting requested review from hyy0322

Assignees

@supereagle supereagle

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zhujian7 @supereagle @caicloud-bot @liwandaniel