From ff0146507d4af8d94b7e4d07f975c54ad33f0b28 Mon Sep 17 00:00:00 2001
From: Alan Peng <peng.alan@gmail.com>
Date: Sat, 20 Jan 2024 12:03:37 -0500
Subject: [PATCH] Upgrade to v2.10.0

---
 build-harbor-aarch64.sh                       |  1 +
 harbor/Makefile                               |  6 +--
 .../about-dialog/about-dialog.component.html  | 45 +++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 harbor/src/portal/src/app/shared/components/about-dialog/about-dialog.component.html

diff --git a/build-harbor-aarch64.sh b/build-harbor-aarch64.sh
index f23d0f2..926c583 100644
--- a/build-harbor-aarch64.sh
+++ b/build-harbor-aarch64.sh
@@ -11,6 +11,7 @@ cd harbor-arm
 git clone --branch ${GIT_BRANCH} https://github.com/goharbor/harbor.git src/github.com/goharbor/harbor
 cp -f ../harbor/Makefile src/github.com/goharbor/harbor/
 cp -f ../harbor/make/photon/Makefile src/github.com/goharbor/harbor/make/photon/
+cp -f ../harbor/src/portal/src/app/shared/components/about-dialog/about-dialog.component.html src/github.com/goharbor/harbor/src/portal/src/app/shared/components/about-dialog/
 
 # compile redis
 make compile_redis
diff --git a/harbor/Makefile b/harbor/Makefile
index d37b47a..976a692 100644
--- a/harbor/Makefile
+++ b/harbor/Makefile
@@ -1,5 +1,3 @@
-GIT_BRANCH="v2.10.0"
-
 # Makefile for Harbor project
 #
 # Targets:
@@ -88,7 +86,7 @@ GEN_TLS=
 
 # version prepare
 # for docker image tag
-VERSIONTAG=${GIT_BRANCH}
+VERSIONTAG=dev
 # for base docker image tag
 BUILD_BASE=true
 PUSHBASEIMAGE=false
@@ -100,7 +98,7 @@ BASEIMAGENAMESPACE=goharbor
 PULL_BASE_FROM_DOCKERHUB=true
 
 # for harbor package name
-PKGVERSIONTAG=${GIT_BRANCH}
+PKGVERSIONTAG=dev
 
 PREPARE_VERSION_NAME=versions
 
diff --git a/harbor/src/portal/src/app/shared/components/about-dialog/about-dialog.component.html b/harbor/src/portal/src/app/shared/components/about-dialog/about-dialog.component.html
new file mode 100644
index 0000000..36f5cb4
--- /dev/null
+++ b/harbor/src/portal/src/app/shared/components/about-dialog/about-dialog.component.html
@@ -0,0 +1,45 @@
+<clr-modal
+    [(clrModalOpen)]="opened"
+    [clrModalClosable]="false"
+    [clrModalStaticBackdrop]="false">
+    <div class="modal-body dialog-body">
+        <div class="harbor-logo-black">
+            <img
+                [src]="
+                    customLogo
+                        ? 'images/' + customLogo
+                        : 'images/harbor-logo.svg'
+                "
+                class="harbor-icon" />
+        </div>
+        <div class="content" tabindex="1">
+            <div>
+                {{ customName ? customName : ('APP_TITLE.HARBOR' | translate) }}
+            </div>
+            <div>
+                <span class="p5 about-version"
+                    >{{ 'ABOUT.VERSION' | translate }} v2.10.0-aarch64 built by Alan Peng.</span
+                >
+            </div>
+            <div *ngIf="!customIntroduction">
+                <p class="p5">{{ 'ABOUT.COPYRIGHT' | translate }}</p>
+                <p class="p5">
+                    <a
+                        routerLink="/license"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        >{{ 'ABOUT.OPEN_SOURCE_LICENSE' | translate }}</a
+                    >
+                </p>
+            </div>
+            <div *ngIf="customIntroduction">
+                <p class="p5">{{ customIntroduction }}</p>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer margin-left-override">
+        <button type="button" class="btn btn-primary" (click)="close()">
+            {{ 'BUTTON.CLOSE' | translate }}
+        </button>
+    </div>
+</clr-modal>