Merge 6d0142d into c4fc79e

.gitignore

@@ -41,14 +41,9 @@ src/ui_ng/typings/
 
 src/ui_ng/src/**/*.js
 src/ui_ng/src/**/*.js.map
-src/ui_ng/src/**/*.json
 
 **/npm*.log
 
-src/ui_ng/aot/**/*.js
-src/ui_ng/aot/**/*.js.map
-src/ui_ng/aot/**/*.json
-
 **/*ngsummary.json
 **/*ngfactory.ts
 **/aot

CONTRIBUTING.md

@@ -95,7 +95,7 @@ The folder graph below shows the structure of the source code folder `harbor/src
 │   └── views
 ├── ui_ng               # The code of harbor web UI
 │   ├── e2e
-│   ├── lib             # Source code of harbor-ui npm library which includes the main UI components of web UI
+│   ├── lib             # Source code of @harbor/ui npm library which includes the main UI components of web UI
 │   └── src             # General web page UI code of Harbor
 └── vendor              # Go code dependencies
     ├── github.com

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/ui ... 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/ui           /harbor/harbor_ui                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/ui``` 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/dev/nodeclarity/angular-cli.json

@@ -17,20 +17,21 @@
         "prefix": "app",
         "mobile": false,
         "styles": [
-            "../node_modules/clarity-icons/clarity-icons.min.css",
-            "../node_modules/clarity-ui/clarity-ui.min.css",
             "../node_modules/prismjs/themes/prism-solarizedlight.css",
+            "../node_modules/@clr/icons/clr-icons.min.css",
+            "../node_modules/@clr/ui/clr-ui.min.css",
             "styles.css"
         ],
         "scripts": [
             "../node_modules/core-js/client/shim.min.js",
             "../node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
             "../node_modules/@webcomponents/custom-elements/custom-elements.min.js",
-            "../node_modules/clarity-icons/clarity-icons.min.js",
             "../node_modules/web-animations-js/web-animations.min.js",
             "../node_modules/marked/lib/marked.js",
             "../node_modules/prismjs/prism.js",
-            "../node_modules/prismjs/components/prism-yaml.min.js"
+            "../node_modules/prismjs/components/prism-yaml.min.js",
+            "../node_modules/@clr/icons/clr-icons.min.js",
+            "../node_modules/web-animations-js/web-animations.min.js"
         ],
         "environmentSource": "environments/environment.ts",
         "environments": {

make/dev/nodeclarity/entrypoint.sh

@@ -26,22 +26,22 @@ fi
 cat ./package.json
 npm install
 
-## Build harbor-ui and link it
+## Build @harbor/ui and link it
 rm -rf /harbor_src/ui_ng/lib/dist
 npm run build:lib
 chmod -R +xr /harbor_src/ui_ng/lib/dist
 cd /harbor_src/ui_ng/lib/dist
 npm link
 cd /harbor_src/ui_ng
-npm link harbor-ui
+npm link @harbor/ui
 
 ## Rollup
-./node_modules/.bin/ngc -p tsconfig-aot.json
+./node_modules/.bin/ngc -p tsconfig.json
 sed -i 's/* as//g' src/app/shared/gauge/gauge.component.js
 ./node_modules/.bin/rollup -c rollup-config.js
 
 ## Unlink
-npm unlink harbor-ui
+npm unlink @harbor/ui
 
 #Copy built js to the static folder
 cp ./dist/build.min.js ../ui/static/

make/docker-compose.chartmuseum.tpl

@@ -4,7 +4,7 @@ services:
     networks:
       harbor-chartmuseum:
         aliases:
-          - harbor-ui
+          - @harbor/ui
   redis:
     networks:
       harbor-chartmuseum:

make/docker-compose.clair.tpl

@@ -4,7 +4,7 @@ services:
     networks:
       harbor-clair:
         aliases:
-          - harbor-ui
+          - @harbor/ui
   jobservice:
     networks:
       - harbor-clair

make/docker-compose.tpl

@@ -87,8 +87,8 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "adminserver"
   ui:
-    image: goharbor/harbor-ui:__version__
-    container_name: harbor-ui
+    image: goharbor/@harbor/ui:__version__
+    container_name: @harbor/ui
     env_file:
       - ./common/config/ui/env
     restart: always

make/ha/docker-compose.clair.tpl

@@ -0,0 +1,34 @@
+version: '2'
+services:
+  ui:
+    networks:
+      harbor-clair:
+        aliases:
+          - @harbor/ui
+  jobservice:
+    networks:
+      - harbor-clair
+  registry:
+    networks:
+      - harbor-clair
+  clair:
+    networks:
+      - harbor-clair
+    container_name: clair
+    image: goharbor/clair-photon:__clair_version__
+    restart: always
+    cpu_quota: 150000
+    depends_on:
+      - log
+    volumes:
+      - ./common/config/clair:/config
+    logging:
+      driver: "syslog"
+      options:
+        syslog-address: "tcp://127.0.0.1:1514"
+        tag: "clair"
+    env_file:
+      ./common/config/clair/clair_env
+networks:
+  harbor-clair:
+    external: false

make/ha/docker-compose.tpl

@@ -0,0 +1,121 @@
+version: '2'
+services:
+  log:
+    image: goharbor/harbor-log:__version__
+    container_name: harbor-log 
+    restart: always
+    volumes:
+      - /var/log/harbor/:/var/log/docker/:z
+      - ./common/config/log/:/etc/logrotate.d/:z
+    ports:
+      - 127.0.0.1:1514:10514
+    networks:
+      - harbor
+  registry:
+    image: goharbor/registry-photon:__reg_version__
+    container_name: registry
+    restart: always
+    volumes:
+      - /data/registry:/storage:z
+      - ./common/config/registry/:/etc/registry/:z
+    networks:
+      - harbor
+    environment:
+      - GODEBUG=netdns=cgo
+    command:
+      ["serve", "/etc/registry/config.yml"]
+    depends_on:
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        tag: "registry"
+  adminserver:
+    image: goharbor/harbor-adminserver:__version__
+    container_name: harbor-adminserver
+    env_file:
+      - ./common/config/adminserver/env
+    restart: always
+    volumes:
+      - /data/config/:/etc/adminserver/config/:z
+      - /data/secretkey:/etc/adminserver/key:z
+      - /data/:/data/:z
+    networks:
+      - harbor
+    depends_on:
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        tag: "adminserver"
+  ui:
+    image: goharbor/@harbor/ui:__version__
+    container_name: @harbor/ui
+    env_file:
+      - ./common/config/ui/env
+    restart: always
+    volumes:
+      - ./common/config/ui/app.conf:/etc/ui/app.conf:z
+      - ./common/config/ui/private_key.pem:/etc/ui/private_key.pem:z
+      - ./common/config/ui/certificates/:/etc/ui/certificates/:z
+      - /data/secretkey:/etc/ui/key:z
+      - /data/ca_download/:/etc/ui/ca/:z
+      - /data/psc/:/etc/ui/token/:z
+    networks:
+      - harbor
+    depends_on:
+      - log
+      - adminserver
+      - registry
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        tag: "ui"
+  jobservice:
+    image: goharbor/harbor-jobservice:__version__
+    container_name: harbor-jobservice
+    env_file:
+      - ./common/config/jobservice/env
+    restart: always
+    volumes:
+      - /data/job_logs:/var/log/jobs:z
+      - ./common/config/jobservice/config.yml:/etc/jobservice/config.yml:z
+      - /data/secretkey:/etc/jobservice/key:z
+    networks:
+      - harbor
+    depends_on:
+      - ui
+      - adminserver
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        tag: "jobservice"
+  proxy:
+    image: goharbor/nginx-photon:__nginx_version__
+    container_name: nginx
+    restart: always
+    volumes:
+      - ./common/config/nginx:/etc/nginx:z
+    networks:
+      - harbor
+    ports:
+      - 80:80
+      - 443:443
+      - 4443:4443
+    depends_on:
+      - registry
+      - ui
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        tag: "proxy"
+networks:
+  harbor:
+    external: false
+