[WIP] feat: add harbor arm build parameters #17968

Jeremy-boo · 2022-12-11T09:17:43Z

Signed-off-by: Jeremy-boo bozhu@alauda.io

Thank you for contributing to Harbor!

Comprehensive Summary of your change

Add support for multi-arch platform builds

Issue being fixed

Fixes #(issue)

Require image for ARM64 architecture Require image for ARM64 architecture #16959
arm64 supported #14330
Please indicate you've done the following:
Well Written Title and Summary of the PR
Label the PR as needed. "release-note/ignore-for-release, release-note/new-feature, release-note/update, release-note/enhancement, release-note/community, release-note/breaking-change, release-note/docs, release-note/infra, release-note/deprecation"
Accepted the DCO. Commits without the DCO will delay acceptance.
Made sure tests are passing and test coverage is added if needed.
Considered the docs impact and opened a new docs issue or PR with docs changes if needed in website repository.

Jeremy-boo · 2022-12-11T09:19:49Z

.github/workflows/CI.yml

@@ -13,6 +13,8 @@ env:
   REDIS_HOST: localhost
   REG_VERSION: v2.7.1-patch-2819-2553
   UI_BUILDER_VERSION: 1.6.0
+   ARCH: amd64


Add support for multi-architecture parameters，default is amd64.

Jeremy-boo · 2022-12-11T09:20:32Z

Makefile

@@ -121,13 +121,19 @@ CHARTMUSEUMVERSION=$(CHARTMUSEUM_SRC_TAG)-redis
 # version of registry for pulling the source code
 REGISTRY_SRC_TAG=v2.8.0

+# go build param


Added support for golang cross-compilation parameters

Jeremy-boo · 2022-12-11T09:21:43Z

Makefile

@@ -147,6 +153,17 @@ DOCKERSAVE=$(DOCKERCMD) save
 DOCKERCOMPOSECMD=$(shell which docker-compose)
 DOCKERTAG=$(DOCKERCMD) tag

+# according to the build platform, replace the relevant parameters.


If compiling the image of the arm architecture, replace the build image parameters arm suffix

Jeremy-boo · 2022-12-11T09:22:22Z

Makefile

+	GOARCH=arm64
+	TRIVY_DOWNLOAD_URL=https://github.com/aquasecurity/trivy/releases/download/$(TRIVYVERSION)/trivy_$(TRIVYVERSION:v%=%)_Linux-ARM64.tar.gz
+	TRIVY_ADAPTER_DOWNLOAD_URL=https://github.com/aquasecurity/harbor-scanner-trivy/releases/download/$(TRIVYADAPTERVERSION)/harbor-scanner-trivy_$(TRIVYADAPTERVERSION:v%=%)_Linux_arm64.tar.gz
+	DOCKERBUILD=$(DOCKERCMD) buildx build --platform linux/arm64 --progress plain --output=type=docker


Replace docker build with dokcer buildx

Jeremy-boo · 2022-12-11T09:23:27Z

Makefile

@@ -371,27 +388,27 @@ check_environment:
 compile_core: gen_apis
 	@echo "compiling binary for core (golang image)..."
 	@echo $(GOBUILDPATHINCONTAINER)
-	@$(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATHINCONTAINER) -w $(GOBUILDPATH_CORE) $(GOBUILDIMAGE) $(GOIMAGEBUILD_CORE) -o $(GOBUILDPATHINCONTAINER)/$(GOBUILDMAKEPATH_CORE)/$(CORE_BINARYNAME)
+	@$(DOCKERCMD) run --rm --env GOOS=$(GOOS) --env GOARCH=$(GOARCH) -v $(BUILDPATH):$(GOBUILDPATHINCONTAINER) -w $(GOBUILDPATH_CORE) $(GOBUILDIMAGE) $(GOIMAGEBUILD_CORE) -o $(GOBUILDPATHINCONTAINER)/$(GOBUILDMAKEPATH_CORE)/$(CORE_BINARYNAME)


Pass golang cross-compilation parameters during compilation to support multi-architecture compilation

Jeremy-boo · 2022-12-11T09:27:07Z

tests/ci/ut_install.sh

@@ -22,12 +22,17 @@ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/insta
 sudo service postgresql stop || echo no postgresql need to be stopped
 sleep 2

+# support for multi-architecture compilation


If you are building an arm image, the replacement tag should have a tag with an arm suffix

Cant this be bundled tho?

Jeremy-boo · 2022-12-11T09:27:51Z

tests/ldapprepare.sh

@@ -8,7 +8,7 @@ docker run --env LDAP_ORGANISATION="Harbor." \
 --env LDAP_TLS_VERIFY_CLIENT="never" \
 -p 389:389 \
 -p 636:636 \
--detach --name $NAME osixia/openldap:1.1.7
+--detach --name $NAME osixia/openldap:1.5.0


openldap version 1.5.0 is a multi-architecture mirror

Jeremy-boo · 2022-12-11T09:28:27Z

tools/mockery/Dockerfile

@@ -7,8 +7,19 @@ ARG MOCKERY_VERSION
 ENV XDG_CACHE_HOME /tmp
 ENV GO111MODULE auto

-RUN mkdir -p /tmp/mockery-${MOCKERY_VERSION} && \
+RUN ARCH= && dpkgArch="$(uname -m)" \


The mockery component supports building arm images

tools/spectral/Dockerfile

tools/swagger/Dockerfile

codecov · 2022-12-12T08:59:09Z

Codecov Report

Merging #17968 (028c28a) into main (da8dae3) will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main   #17968      +/-   ##
==========================================
+ Coverage   66.40%   66.42%   +0.01%     
==========================================
  Files        1012     1012              
  Lines      108670   108670              
  Branches     2674     2674              
==========================================
+ Hits        72167    72182      +15     
+ Misses      32540    32528      -12     
+ Partials     3963     3960       -3

Flag	Coverage Δ
unittests	`66.42% <ø> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
src/controller/event/handler/auditlog/auditlog.go	`14.28% <0.00%> (-42.86%)`	⬇️
...g-retention-tasks/tag-retention-tasks.component.ts	`75.00% <0.00%> (-9.38%)`	⬇️
...dashboard/schedule-card/schedule-card.component.ts	`43.28% <0.00%> (-2.99%)`	⬇️
src/server/v2.0/handler/user.go	`13.43% <0.00%> (+1.55%)`	⬆️
...-job/gc-page/gc/gc-history/gc-history.component.ts	`46.51% <0.00%> (+5.81%)`	⬆️
...audit-log-purge/history/purge-history.component.ts	`46.51% <0.00%> (+5.81%)`	⬆️
...es/vulnerability/vulnerability-config.component.ts	`62.96% <0.00%> (+8.88%)`	⬆️
...d/worker-card/donut-chart/donut-chart.component.ts	`60.00% <0.00%> (+11.42%)`	⬆️

Signed-off-by: Jeremy-boo <bozhu@alauda.io>

lengrongfu · 2023-02-09T09:15:04Z

@Jeremy-boo Hi, I want to know why the current pr has not been merged, and I hope I can help solve some problems.

Jeremy-boo · 2023-02-10T02:12:31Z

@Jeremy-boo Hi, I want to know why the current pr has not been merged, and I hope I can help solve some problems.

Sorry, this PR has already been reviewed before. I was busy at the beginning of the year and didn’t have time to deal with the comments. I will send time to deal with the comments this weekend, and then re-initiate the review process. Thank you very much

github-actions · 2023-04-11T09:03:30Z

This PR is being marked stale due to a period of inactivty. If this PR is still relevant, please comment or remove the stale label. Otherwise, this PR will close in 30 days.

odidev · 2023-04-11T10:13:48Z

@dioguerra @wy65701436
Could you please review this PR?

jamezrin · 2023-07-13T10:35:47Z

Any news regarding this PR?

github-actions · 2023-09-12T09:03:39Z

This PR is being marked stale due to a period of inactivty. If this PR is still relevant, please comment or remove the stale label. Otherwise, this PR will close in 30 days.

github-actions · 2023-10-12T09:04:05Z

This PR was closed because it has been stalled for 30 days with no activity. If this PR is still relevant, please re-open a new PR against main.

Jeremy-boo requested a review from a team as a code owner December 11, 2022 09:17

github-actions bot assigned AllForNothing, chlins and MinerYang Dec 11, 2022

Jeremy-boo commented Dec 11, 2022

View reviewed changes

AllForNothing requested a review from wy65701436 December 12, 2022 08:53

AllForNothing assigned wy65701436 and YangJiao0817 and unassigned AllForNothing, chlins and MinerYang Dec 12, 2022

AllForNothing requested a review from YangJiao0817 December 12, 2022 08:54

AllForNothing added the release-note/enhancement Label to mark PR to be added under release notes as enhancement label Dec 12, 2022

Jeremy-boo force-pushed the feat/harbor_arm_build_make_to_main branch from cd0a600 to 70d8e5f Compare December 12, 2022 14:37

feat: add harbor arm build parameters

028c28a

Signed-off-by: Jeremy-boo <bozhu@alauda.io>

Jeremy-boo force-pushed the feat/harbor_arm_build_make_to_main branch from 70d8e5f to 028c28a Compare December 20, 2022 01:05

wy65701436 mentioned this pull request Jan 17, 2023

arm harbor #18100

Closed

Jeremy-boo mentioned this pull request Jan 31, 2023

Require image for ARM64 architecture goharbor/harbor-arm#31

Open

github-actions bot added the Stale label Apr 11, 2023

github-actions bot removed the Stale label Apr 12, 2023

wy65701436 changed the title ~~feat: add harbor arm build parameters~~ [WIP] feat: add harbor arm build parameters May 15, 2023

github-actions bot added the Stale label Sep 12, 2023

github-actions bot closed this Oct 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] feat: add harbor arm build parameters #17968

[WIP] feat: add harbor arm build parameters #17968

Jeremy-boo commented Dec 11, 2022 •

edited

Loading

Jeremy-boo Dec 11, 2022

Jeremy-boo Dec 11, 2022

Jeremy-boo Dec 11, 2022

Jeremy-boo Dec 11, 2022

Jeremy-boo Dec 11, 2022

Jeremy-boo Dec 11, 2022

dioguerra Jan 26, 2023

Jeremy-boo Dec 11, 2022

Jeremy-boo Dec 11, 2022

codecov bot commented Dec 12, 2022 •

edited

Loading

lengrongfu commented Feb 9, 2023

Jeremy-boo commented Feb 10, 2023

github-actions bot commented Apr 11, 2023

odidev commented Apr 11, 2023

jamezrin commented Jul 13, 2023

github-actions bot commented Sep 12, 2023

github-actions bot commented Oct 12, 2023

[WIP] feat: add harbor arm build parameters #17968

[WIP] feat: add harbor arm build parameters #17968

Conversation

Jeremy-boo commented Dec 11, 2022 • edited Loading

Comprehensive Summary of your change

Issue being fixed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Dec 12, 2022 • edited Loading

Codecov Report

lengrongfu commented Feb 9, 2023

Jeremy-boo commented Feb 10, 2023

github-actions bot commented Apr 11, 2023

odidev commented Apr 11, 2023

jamezrin commented Jul 13, 2023

github-actions bot commented Sep 12, 2023

github-actions bot commented Oct 12, 2023

Jeremy-boo commented Dec 11, 2022 •

edited

Loading

codecov bot commented Dec 12, 2022 •

edited

Loading