Commit Graph

6818 Commits

Author SHA1 Message Date
Daniel Jiang
866a86b6f1
Merge pull request #6647 from overdogwatch/master
Update Dockerfile
2018-12-28 15:24:13 +08:00
overdogwatch
a8d0ab1a21 Update Dockerfile
I guess that the purpose of this check is to verify that the container is listening on port 10514. Healthcheck default timeout is 30 sec. In places where the DNS resolver is not working properly, this check could take more than 30 sec, which leads to decide that the container health is unhealthy. I advise you to add to your check the option n, which prevents netstat trying to determine the symbolic host.

Signed-off-by: overdogwatch <overdogwatch@gmail.com>
2018-12-27 09:47:48 +02:00
Mia ZHOU
9825711250
Merge pull request #6610 from ninjadq/add_customized_location_to_nginx
Add customized config file for proxy
2018-12-26 15:41:41 +08:00
Qian Deng
af7b61ebd5 Add customized config file for proxy
This is a solution for product that using harbor as proxy to add customized location

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-26 13:35:07 +08:00
Mia ZHOU
4f291e34eb
Merge pull request #6630 from pureshine/refactor-config
Config component nav tabs to use clarity component
2018-12-26 12:18:54 +08:00
Fangyuan Cheng
1456d1d326
Merge pull request #6628 from zhoumeina/add_swagger_title
add harbor swagger title for api explorer
2018-12-26 10:37:57 +08:00
Mia ZHOU
9a597e274f
Merge pull request #6621 from pureshine/download-cert
When harbor is deployed in http mode, the registry certificate download button is not displayed in the project page.
2018-12-26 09:45:46 +08:00
Meina Zhou
92539a4bec add harbor swagger title for api explorer
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-26 09:41:54 +08:00
FangyuanCheng
4ad66b6d9b Config component nav tabs to use clarity component
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 18:36:18 +08:00
FangyuanCheng
a4e17ec183 When harbor is deployed in http mode, the registry certificate download button is not displayed in the project page.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 14:31:29 +08:00
cd1989
c117a23133 Validate repo and tag names in retag
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-24 16:49:39 +08:00
Fangyuan Cheng
c0745c6ee5
Merge pull request #6606 from pureshine/download-cert
Fix download certificate link bug
2018-12-24 11:27:41 +08:00
FangyuanCheng
256289810d Fix download certificate link bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-24 00:06:04 +08:00
Qian Deng
3aa9f2b368
Merge pull request #6595 from pureshine/fix-retagcase
fix nightly test of retag
2018-12-21 18:52:08 +08:00
FangyuanCheng
9a52059e89 fix nightly test of retag
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-21 17:34:15 +08:00
Daniel Jiang
93c0a18b06
Merge pull request #6537 from stonezdj/ref_admin_driver
Refactor config settings stage2
2018-12-21 15:12:56 +08:00
stonezdj
2446878f6b Refactor config settings stage2
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-21 10:59:11 +08:00
He Weiwei
f403e50234
Merge pull request #6577 from heww/master
Include os version in image tag detail page
2018-12-20 18:18:44 +08:00
Qian Deng
c4ecd4e0f6 Fix i18n switch issue (#6579)
This issue is caused by error formated json file

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 15:52:59 +08:00
He Weiwei
e7f09643bd Include os version in image tag detail page
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2018-12-20 15:12:19 +08:00
Mia ZHOU
2850a869ab
Merge pull request #6574 from ninjadq/add_i18n_item_in_project_detail
Update i18n files of project_detail
2018-12-20 10:55:53 +08:00
Qian Deng
1430a24b55 Update i18n files of project_detail
Add `helmchart` item in `project_detail` entry

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 10:09:26 +08:00
Fangyuan Cheng
ebf12fc31b
Merge pull request #6567 from pureshine/modify-version
Modify the developer center version number to 1.7.0
2018-12-19 18:31:56 +08:00
FangyuanCheng
eb6e3504d8 Modify the developer center version number to 1.7.0
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-19 17:18:54 +08:00
Mia ZHOU
f21cce7cbf
Merge pull request #6564 from zhoumeina/fix_retag_ui
fix retag project list can not select
2018-12-19 15:24:27 +08:00
Meina Zhou
66c1beb467 fix retag project list can not select
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 14:39:49 +08:00
Mia ZHOU
ac47500eb6
Merge pull request #6552 from pureshine/inline-css
Move inline css style to scss
2018-12-19 13:40:16 +08:00
Mia ZHOU
2062c436d3
Merge pull request #6553 from zhoumeina/fix_retag_ui
show retag tooltip use regex, reset the dialog form when retagged
2018-12-19 13:32:07 +08:00
Meina Zhou
a3e357bb7f show retag tooltip use regex, reset the dialog form when retagged
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 13:07:46 +08:00
Steven Zou
007a37443e
Merge pull request #6495 from kofj/doc_for_build_history
update user_guide about the build history.
2018-12-19 10:58:07 +08:00
Fangyuan Cheng
bb15f67316
Merge branch 'master' into inline-css 2018-12-19 10:07:21 +08:00
FangyuanCheng
c36e9daea1 Move inline css style to scss
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-18 21:19:08 +08:00
Frank Kung
aa1c1ce489 update user_guide about the build history.
Signed-off-by: Frank Kung <kfanjian@gmail.com>
2018-12-18 15:50:01 +08:00
Wenkai Yin
b28bca7af4
Merge pull request #6541 from salkin/proxy-transport
Add support for http proxy in transport
2018-12-18 15:46:29 +08:00
danfengliu
70016cc0eb
Change a small docker image to pull and make timeout value longer (#6543)
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-12-18 10:21:03 +08:00
Niklas Wik
138bc69f0f Add support for http proxy in transport
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
2018-12-17 10:35:27 +02:00
Niklas Wik
86f4d11839 Update required docker as multi build with FROM as used which is introduced in Docker 17.05 (#6530)
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
2018-12-14 12:50:41 +08:00
Mia ZHOU
da0f1d2831
Merge pull request #6525 from zhoumeina/dev-center1
add developer center in swagger ui way
2018-12-13 16:27:55 +08:00
Meina Zhou
d45ccbbb29 add developer center in swagger ui way
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-13 15:17:38 +08:00
SDBrett
0e260d180c Added tests for failure conditions (#6501)
Added unit tests for registryctl auth to cover failure conditions to increase test coverage.
New tests cover no secret specified and incorrect harbor secret prefix

Signed-off-by: Brett Johnson <brett@sdbrett.com>
2018-12-13 11:35:17 +08:00
clouderati
3a38ff928e Updating CONTRIBUTING.md
Fixing merge conflict created in #6133.

Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-12-12 17:02:37 +00:00
James Zabala
6ac0c4b882
Merge pull request #6416 from danfengliu/Modify-Test-Script-Project-Level-Policy-Content-Trust
Remove redundant functions
2018-12-12 11:19:35 -05:00
James Zabala
191d0b6c12
Merge pull request #6508 from cd1989/update-doc-for-dco
Add DCO description to CONTRIBUTING.md
2018-12-12 09:38:28 -05:00
Wenkai Yin
5ae7e60b73
Merge pull request #6519 from mweigel/master
Minor corrections to swagger spec
2018-12-12 17:27:31 +08:00
Mario Weigel
187fccae6f Minor corrections to swagger spec
Signed-off-by: Mario Weigel <mario.weigel@gmail.com>
2018-12-12 21:58:24 +13:00
stonezdj(Daojun Zhang)
13511d74ed Refactor config settings encrypt + metadata (#6387)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-12 12:14:33 +08:00
Wenkai Yin
f7a28ee2a2 Remove the duplicate http error struct (#6516)
There are two different types to represent http error in the current code. This commit updates the codes to keep only one.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-12 11:51:19 +08:00
Daniel Jiang
b954393109 Update OSL for 1.7.0 (#6509)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-11 16:53:44 +08:00
cd1989
6d9fc4fec0 Add DCO description to CONTRIBUTING.md
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-11 14:29:17 +08:00
Wenkai Yin
5388eb4db6 Read ssl mode param from the adminserver to init the connection with database (#6504)
This commit adds the ssl mode as a param when establishing the connection with database

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-11 13:58:37 +08:00