Rename harbor-ui to harbor-core

1. Update the nginx.conf
2. Update Makefile
3. Update docker-compose
4. Update image name
5. Rename folder ui to core
6. Change the harbor-ui's package name to core
7. Remove unused static file on harbor-core
8. Remove unused code for harbor-portal

Signed-off-by: Qian Deng <[email protected]>

.gitignore

@@ -4,26 +4,17 @@ harbor
 make/docker-compose.yml
 make/common/config/*
 make/dev/adminserver/harbor_adminserver
-make/dev/ui/harbor_ui
+make/dev/core/harbor_core
 make/dev/jobservice/harbor_jobservice
 make/photon/*/binary/
 
 src/adminserver/adminserver
-src/ui/ui
+src/core/core
 src/jobservice/jobservice
 src/common/dao/dao.test
 *.pyc
 jobservice/test
 
-src/ui/static/*.html
-src/ui/static/*.bundle.js
-src/ui/static/*.bundle.js.map
-src/ui/static/harbor-logo.*.png
-src/ui/static/*.min.*
-src/ui/static/styles.css
-src/ui/static/i18n
-src/ui/static/shapes
-
 src/portal/coverage/
 src/portal/dist/
 src/portal/html-report/

.travis.yml

@@ -22,7 +22,7 @@ env:
   DOCKER_COMPOSE_VERSION: 1.7.1
   HARBOR_ADMIN: admin
   HARBOR_ADMIN_PASSWD: Harbor12345
-  UI_SECRET: tempString
+  CORE_SECRET: tempString
   KEY_PATH: /data/secretkey
   REDIS_HOST: localhost
   REG_VERSION: v2.6.2
@@ -44,7 +44,7 @@ before_install:
   - sudo ./tests/generateCerts.sh
   - sudo ./make/prepare
   - sudo mkdir -p "/data/redis"
-  - sudo mkdir -p /etc/ui/ca/ && sudo mv ./tests/ca.crt /etc/ui/ca/
+  - sudo mkdir -p /etc/core/ca/ && sudo mv ./tests/ca.crt /etc/core/ca/
   - sudo mkdir -p /harbor && sudo mv ./VERSION /harbor/UIVERSION
   - sudo ./tests/testprepare.sh
 
@@ -90,6 +90,6 @@ script:
   - sudo docker-compose -f ./make/docker-compose.test.yml up -d
   - make go_check
   - ./tests/pushimage.sh
-  - go test -race -i ./src/ui ./src/adminserver ./src/jobservice
+  - go test -race -i ./src/core ./src/adminserver ./src/jobservice
   - sudo -E env "PATH=$PATH" "POSTGRES_MIGRATION_SCRIPTS_PATH=/home/travis/gopath/src/github.com/goharbor/harbor/make/migrations/postgresql/" ./tests/coverage4gotest.sh
   - goveralls -coverprofile=profile.cov -service=travis-ci

Makefile

@@ -10,7 +10,7 @@
 #			compile from golang image
 #			for example: make compile_golangimage -e GOBUILDIMAGE= \
 #							golang:1.7.3
-# compile_adminserver, compile_ui, compile_jobservice: compile specific binary
+# compile_adminserver, compile_core, compile_jobservice: compile specific binary
 #
 # build:	build Harbor docker images from photon baseimage
 #
@@ -67,8 +67,8 @@ MAKEPATH=$(BUILDPATH)/make
 MAKEDEVPATH=$(MAKEPATH)/dev
 SRCPATH=./src
 TOOLSPATH=$(BUILDPATH)/tools
-UIPATH=$(BUILDPATH)/src/ui
-UINGPATH=$(BUILDPATH)/src/portal
+CORE_PATH=$(BUILDPATH)/src/core
+PORTAL_PATH=$(BUILDPATH)/src/portal
 GOBASEPATH=/go/src/github.com/goharbor
 CHECKENVCMD=checkenv.sh
 
@@ -129,20 +129,20 @@ GOBUILDPATH=$(GOBASEPATH)/harbor
 GOIMAGEBUILDCMD=/usr/local/go/bin/go
 GOIMAGEBUILD=$(GOIMAGEBUILDCMD) build
 GOBUILDPATH_ADMINSERVER=$(GOBUILDPATH)/src/adminserver
-GOBUILDPATH_UI=$(GOBUILDPATH)/src/ui
+GOBUILDPATH_CORE=$(GOBUILDPATH)/src/core
 GOBUILDPATH_JOBSERVICE=$(GOBUILDPATH)/src/jobservice
 GOBUILDPATH_REGISTRYCTL=$(GOBUILDPATH)/src/registryctl
 GOBUILDMAKEPATH=$(GOBUILDPATH)/make
 GOBUILDMAKEPATH_ADMINSERVER=$(GOBUILDMAKEPATH)/photon/adminserver
-GOBUILDMAKEPATH_UI=$(GOBUILDMAKEPATH)/photon/ui
+GOBUILDMAKEPATH_CORE=$(GOBUILDMAKEPATH)/photon/core
 GOBUILDMAKEPATH_JOBSERVICE=$(GOBUILDMAKEPATH)/photon/jobservice
 GOBUILDMAKEPATH_REGISTRYCTL=$(GOBUILDMAKEPATH)/photon/registryctl
 
 # binary
 ADMINSERVERBINARYPATH=$(MAKEDEVPATH)/adminserver
 ADMINSERVERBINARYNAME=harbor_adminserver
-UIBINARYPATH=$(MAKEDEVPATH)/ui
-UIBINARYNAME=harbor_ui
+CORE_BINARYPATH=$(MAKEDEVPATH)/core
+CORE_BINARYNAME=harbor_core
 JOBSERVICEBINARYPATH=$(MAKEDEVPATH)/jobservice
 JOBSERVICEBINARYNAME=harbor_jobservice
 REGISTRYCTLBINARYPATH=$(MAKEDEVPATH)/registryctl
@@ -176,7 +176,7 @@ DOCKERFILEPATH_COMMON=$(MAKEPATH)/common
 # docker image name
 DOCKERIMAGENAME_ADMINSERVER=goharbor/harbor-adminserver
 DOCKERIMAGENAME_PORTAL=goharbor/harbor-portal
-DOCKERIMAGENAME_UI=goharbor/harbor-ui
+DOCKERIMAGENAME_CORE=goharbor/harbor-core
 DOCKERIMAGENAME_JOBSERVICE=goharbor/harbor-jobservice
 DOCKERIMAGENAME_LOG=goharbor/harbor-log
 DOCKERIMAGENAME_DB=goharbor/harbor-db
@@ -211,7 +211,7 @@ REGISTRYPASSWORD=default
 # cmds
 DOCKERSAVE_PARA=$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_PORTAL):$(VERSIONTAG) \
-		$(DOCKERIMAGENAME_UI):$(VERSIONTAG) \
+		$(DOCKERIMAGENAME_CORE):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_LOG):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_DB):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
@@ -271,11 +271,11 @@ compile_adminserver:
 	$(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATH) -w $(GOBUILDPATH_ADMINSERVER) $(GOBUILDIMAGE) $(GOIMAGEBUILD) -o $(GOBUILDMAKEPATH_ADMINSERVER)/$(ADMINSERVERBINARYNAME)
 	@echo "Done."
 
-compile_ui:
-	@echo "compiling binary for ui (golang image)..."
+compile_core:
+	@echo "compiling binary for core (golang image)..."
 	@echo $(GOBASEPATH)
 	@echo $(GOBUILDPATH)
-	@$(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATH) -w $(GOBUILDPATH_UI) $(GOBUILDIMAGE) $(GOIMAGEBUILD) -o $(GOBUILDMAKEPATH_UI)/$(UIBINARYNAME)
+	@$(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATH) -w $(GOBUILDPATH_CORE) $(GOBUILDIMAGE) $(GOIMAGEBUILD) -o $(GOBUILDMAKEPATH_CORE)/$(CORE_BINARYNAME)
 	@echo "Done."
 
 compile_jobservice:
@@ -288,7 +288,7 @@ compile_registryctl:
 	@$(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATH) -w $(GOBUILDPATH_REGISTRYCTL) $(GOBUILDIMAGE) $(GOIMAGEBUILD) -o $(GOBUILDMAKEPATH_REGISTRYCTL)/$(REGISTRYCTLBINARYNAME)
 	@echo "Done."
 
-compile:check_environment compile_adminserver compile_ui compile_jobservice compile_registryctl
+compile:check_environment compile_adminserver compile_core compile_jobservice compile_registryctl
 
 prepare:
 	@echo "preparing..."
@@ -331,7 +331,7 @@ modify_sourcefiles:
 	@chmod 600 $(MAKEPATH)/common/templates/notary/notary-signer.key
 	@chmod 600 $(MAKEPATH)/common/templates/notary/notary-signer.crt
 	@chmod 600 $(MAKEPATH)/common/templates/notary/notary-signer-ca.crt
-	@chmod 600 $(MAKEPATH)/common/templates/ui/private_key.pem
+	@chmod 600 $(MAKEPATH)/common/templates/core/private_key.pem
 	@chmod 600 $(MAKEPATH)/common/templates/registry/root.crt
 
 install: compile version build modify_sourcefiles prepare modify_composefile start
@@ -411,10 +411,10 @@ pushimage:
 		$(REGISTRYUSER) $(REGISTRYPASSWORD) $(REGISTRYSERVER)
 	@$(DOCKERRMIMAGE) $(REGISTRYSERVER)$(DOCKERIMAGENAME_PORTAL):$(VERSIONTAG)
 
-	@$(DOCKERTAG) $(DOCKERIMAGENAME_UI):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG)
-	@$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG) \
+	@$(DOCKERTAG) $(DOCKERIMAGENAME_CORE):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_CORE):$(VERSIONTAG)
+	@$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_CORE):$(VERSIONTAG) \
 		$(REGISTRYUSER) $(REGISTRYPASSWORD) $(REGISTRYSERVER)
-	@$(DOCKERRMIMAGE) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG)
+	@$(DOCKERRMIMAGE) $(REGISTRYSERVER)$(DOCKERIMAGENAME_CORE):$(VERSIONTAG)
 
 	@$(DOCKERTAG) $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG)
 	@$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
@@ -459,13 +459,13 @@ swagger_client:
 cleanbinary:
 	@echo "cleaning binary..."
 	@if [ -f $(ADMINSERVERBINARYPATH)/$(ADMINSERVERBINARYNAME) ] ; then rm $(ADMINSERVERBINARYPATH)/$(ADMINSERVERBINARYNAME) ; fi
-	@if [ -f $(UIBINARYPATH)/$(UIBINARYNAME) ] ; then rm $(UIBINARYPATH)/$(UIBINARYNAME) ; fi
+	@if [ -f $(CORE_BINARYPATH)/$(CORE_BINARYNAME) ] ; then rm $(CORE_BINARYPATH)/$(CORE_BINARYNAME) ; fi
 	@if [ -f $(JOBSERVICEBINARYPATH)/$(JOBSERVICEBINARYNAME) ] ; then rm $(JOBSERVICEBINARYPATH)/$(JOBSERVICEBINARYNAME) ; fi
 
 cleanimage:
 	@echo "cleaning image for photon..."
 	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG)
-	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_UI):$(VERSIONTAG)
+	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_CORE):$(VERSIONTAG)
 	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_DB):$(VERSIONTAG)
 	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG)
 	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG)
@@ -492,7 +492,7 @@ cleanall: cleanbinary cleanimage cleandockercomposefile cleanversiontag cleanpac
 clean:
 	@echo "  make cleanall:		remove binary, Harbor images, specific version docker-compose"
 	@echo "		file, specific version tag, online and offline install package"
-	@echo "  make cleanbinary:		remove ui and jobservice binary"
+	@echo "  make cleanbinary:		remove core and jobservice binary"
 	@echo "  make cleanimage:		remove Harbor images"
 	@echo "  make cleandockercomposefile:	remove specific version docker-compose"
 	@echo "  make cleanversiontag:		cleanpackageremove specific version tag"

docs/configure_swagger.md

@@ -46,10 +46,10 @@ From time to time, you may need to mannually test Harbor REST API. You can deplo
 ui:
   ... 
   volumes:
-    - ./common/config/ui/app.conf:/etc/ui/app.conf:z
-    - ./common/config/ui/private_key.pem:/etc/ui/private_key.pem:z
-    - /data/secretkey:/etc/ui/key:z
-    - /data/ca_download/:/etc/ui/ca/:z
+    - ./common/config/ui/app.conf:/etc/core/app.conf:z
+    - ./common/config/ui/private_key.pem:/etc/core/private_key.pem:z
+    - /data/secretkey:/etc/core/key:z
+    - /data/ca_download/:/etc/core/ca/:z
     ## add two lines as below ##
     - ../src/ui/static/vendors/swagger-ui-2.1.4/dist:/harbor/static/vendors/swagger
     - ../src/ui/static/resources/yaml/swagger.yaml:/harbor/static/resources/yaml/swagger.yaml

docs/installation_guide.md

@@ -198,7 +198,7 @@ Stopping Harbor:
 $ sudo docker-compose stop
 Stopping nginx ... done
 Stopping harbor-jobservice ... done
-Stopping harbor-ui ... done
+Stopping harbor-core ... done
 Stopping harbor-db ... done
 Stopping registry ... done
 Stopping harbor-log ... done
@@ -375,11 +375,11 @@ By default, Harbor limits the CPU usage of Clair container to 150000 and avoids
   harbor-db           docker-entrypoint.sh mysqld      Up      3306/tcp                                 
   harbor-jobservice   /harbor/harbor_jobservice        Up                                               
   harbor-log          /bin/sh -c crond && rsyslo ...   Up      127.0.0.1:1514->514/tcp                    
-  harbor-ui           /harbor/harbor_ui                Up                                               
+  harbor-core           /harbor/harbor_core            Up                                               
   nginx               nginx -g daemon off;             Up      0.0.0.0:443->443/tcp, 0.0.0.0:80->80/tcp 
   registry            /entrypoint.sh serve /etc/ ...   Up      5000/tcp                                 
 ```
-If a container is not in **UP** state, check the log file of that container in directory ```/var/log/harbor```. For example, if the container ```harbor-ui``` is not running, you should look at the log file ```ui.log```.  
+If a container is not in **UP** state, check the log file of that container in directory ```/var/log/harbor```. For example, if the container ```harbor-core``` is not running, you should look at the log file ```ui.log```.  
 
 
 2.When setting up Harbor behind an nginx proxy or elastic load balancing, look for the line below, in `common/templates/nginx/nginx.http.conf` and remove it from the sections if the proxy already has similar settings: `location /`, `location /v2/` and `location /service/`.

make/common/templates/adminserver/env

@@ -36,7 +36,7 @@ EMAIL_INSECURE=$email_insecure
 HARBOR_ADMIN_PASSWORD=$harbor_admin_password
 PROJECT_CREATION_RESTRICTION=$project_creation_restriction
 MAX_JOB_WORKERS=$max_job_workers
-UI_SECRET=$ui_secret
+CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret
 TOKEN_EXPIRATION=$token_expiration
 CFG_EXPIRATION=5
@@ -55,7 +55,7 @@ UAA_ENDPOINT=$uaa_endpoint
 UAA_CLIENTID=$uaa_clientid
 UAA_CLIENTSECRET=$uaa_clientsecret
 UAA_VERIFY_CERT=$uaa_verify_cert
-UI_URL=$ui_url
+CORE_URL=$core_url
 JOBSERVICE_URL=$jobservice_url
 CLAIR_URL=$clair_url
 NOTARY_URL=$notary_url

make/common/templates/chartserver/env

@@ -9,7 +9,7 @@ CACHE_REDIS_DB=$cache_redis_db_index
 
 # Credential for internal communication
 BASIC_AUTH_USER=chart_controller
-BASIC_AUTH_PASS=$ui_secret
+BASIC_AUTH_PASS=$core_secret
 
 # Multiple tenants
 # Must be set with 1 to support project namespace

make/common/templates/clair/config.yaml

@@ -22,4 +22,4 @@ clair:
     attempts: 3
     renotifyinterval: 2h
     http:
-      endpoint: http://ui:8080/service/notifications/clair
+      endpoint: http://core:8080/service/notifications/clair

make/common/templates/ui/env → make/common/templates/core/env

@@ -1,10 +1,10 @@
 LOG_LEVEL=info
-CONFIG_PATH=/etc/ui/app.conf
-UI_SECRET=$ui_secret
+CONFIG_PATH=/etc/core/app.conf
+CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret
 GODEBUG=netdns=cgo
 ADMINSERVER_URL=$adminserver_url
-UAA_CA_ROOT=/etc/ui/certificates/uaa_ca.pem
+UAA_CA_ROOT=/etc/core/certificates/uaa_ca.pem
 _REDIS_URL=$redis_host:$redis_port,100,$redis_password
 SYNC_REGISTRY=false
 CHART_CACHE_DRIVER=$chart_cache_driver

make/common/templates/jobservice/env

@@ -1,4 +1,4 @@
-UI_SECRET=$ui_secret
+CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret
 ADMINSERVER_URL=$adminserver_url
 GODEBUG=netdns=cgo

make/common/templates/nginx/nginx.http.conf

@@ -12,8 +12,8 @@ http {
   # this is necessary for us to be able to disable request buffering in all cases
   proxy_http_version 1.1;
 
-  upstream ui {
-    server ui:8080;
+  upstream core {
+    server core:8080;
   }
 
   upstream portal {
@@ -47,7 +47,7 @@ http {
     }
 
     location /api/ {
-      proxy_pass http://ui/api/;
+      proxy_pass http://core/api/;
       proxy_set_header Host $$host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
@@ -60,7 +60,7 @@ http {
     }
 
     location ~ ^/(login|log_out|sendEmail|language|reset|userExists|reset_password|chartrepo) {
-      proxy_pass http://ui/;
+      proxy_pass http://core/;
       proxy_set_header Host $$host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
@@ -77,7 +77,7 @@ http {
     }
 
     location /v2/ {
-      proxy_pass http://ui/v2/;
+      proxy_pass http://core/v2/;
       proxy_set_header Host $$http_host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
@@ -89,7 +89,7 @@ http {
     }
 
     location /service/ {
-      proxy_pass http://ui/service/;
+      proxy_pass http://core/service/;
       proxy_set_header Host $$host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;

make/common/templates/nginx/nginx.https.conf

@@ -13,8 +13,8 @@ http {
   # this is necessary for us to be able to disable request buffering in all cases
   proxy_http_version 1.1;
 
-  upstream ui {
-    server ui:8080;
+  upstream core {
+    server core:8080;
   }
 
   upstream portal {
@@ -67,7 +67,7 @@ http {
     }
 
     location /api/ {
-      proxy_pass http://ui/api/;
+      proxy_pass http://core/api/;
       proxy_set_header Host $$host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
@@ -80,7 +80,7 @@ http {
     }
 
     location ~ ^/(login|log_out|sendEmail|language|reset|userExists|reset_password|chartrepo) {
-      proxy_pass http://ui;
+      proxy_pass http://core;
       proxy_set_header Host $$host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
@@ -97,7 +97,7 @@ http {
     }
 
     location /v2/ {
-      proxy_pass http://ui/v2/;
+      proxy_pass http://core/v2/;
       proxy_set_header Host $$http_host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
@@ -109,7 +109,7 @@ http {
     }
 
     location /service/ {
-      proxy_pass http://ui/service/;
+      proxy_pass http://core/service/;
       proxy_set_header Host $$http_host;
       proxy_set_header X-Real-IP $$remote_addr;
       proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;

make/common/templates/registry/config.yml

@@ -31,7 +31,7 @@ notifications:
   endpoints:
   - name: harbor
     disabled: false
-    url: $ui_url/service/notifications
+    url: $core_url/service/notifications
     timeout: 3000ms
     threshold: 5
     backoff: 1s

make/common/templates/registryctl/env

@@ -1,3 +1,3 @@
-UI_SECRET=$ui_secret
+CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret