Commit Graph

4637 Commits

Author SHA1 Message Date
Yan
985b570bdc
Limit dns search in harbor containers (#6058)
This commit is to set dns search to null in the harbor containers,
that means the dns search domains of docker host doesn't impact
the network IO in the containers.

If do not set this, Harbor notary-server and notary-signer are resolving
the "mysql" alias to the resolv.conf search path instead of to "mysql."
for the notary-db bridge IP, see #6031.

According to docker official document, 'Use --dns-search=.' if you don't
wish to set the search domain.

https://docs.docker.com/v17.09/engine/userguide/networking/default_network/configure-dns/

Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-17 12:29:47 +08:00
Daniel Jiang
429a7c3c15
Merge pull request #6042 from reasonerjt/bump-up-clair-cherrypick-1.5.0
Bump up clair cherrypick 1.5.0
2018-10-16 13:49:32 +08:00
Yan
8df98a308e
Merge branch 'release-1.5.0' into bump-up-clair-cherrypick-1.5.0 2018-10-16 11:31:39 +08:00
Daniel Jiang
d949e66117 Update OSL and bump up version to 1.5.4
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-15 13:57:36 +08:00
Daniel Jiang
00eec1b2dd Bump up Clair to 2.0.6 (#6016)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-15 10:45:59 +08:00
Daniel Jiang
9a63020746 Update LICENSE and OSL (#5874)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-09-12 14:01:07 +08:00
Yan
f441881ffc
Promote release version to v1.5.3 (#5811)
Signed-off-by: wang yan <wangyan@vmware.com>
2018-09-04 15:35:59 +08:00
Yan
56229f719f
Update the base image in the offline installer (#5807)
Signed-off-by: wang yan <wangyan@vmware.com>
2018-09-04 14:32:26 +08:00
Daniel Jiang
5bded8e6a1 Bump up clair to v2.0.5 (#5787)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-09-03 18:37:51 +08:00
Daniel Jiang
bd5098870c Update photon base images -- for 1.5 branch (#5376)
This commit update the base photon image from vmware/photon:1.0 to
photon:1.0 in 1.5 branch
2018-07-25 11:05:12 +08:00
Daniel Jiang
8e61deae7c
Merge pull request #5333 from reasonerjt/release-1.5.0
Update Makefile and OSL
2018-07-18 16:59:16 +08:00
Daniel Jiang
21c402036c Update Makefile and OSL
This commit adds the OSL to repo, and updates Makefile to package it.
2018-07-18 15:48:13 +08:00
Daniel Jiang
ae0997ea53
Merge pull request #5311 from stonezdj/release_1.5.0_fix_reloadcfg
Add SafeCast function and set default value for some sytem configure
2018-07-17 16:12:39 +08:00
stonezdj
5bc3c6bdcd Add SafeCast function and set default value for some sytem configure
Add SafeCastString, SafeCastInt, SafeCastFloat64, SafeCastBool to check
the type matched or not to avoid panic in runtime

Add default value to configure settings to avoid can not save result
issue
2018-07-17 15:17:22 +08:00
Daniel Jiang
218765edf0 Bump up clair to v2.0.4 -- cherrypick to 1.5 (#5298)
This commit bump up clair to v2.0.4.  The current build process is
download the binary from google storage, the update of the binary in
google storage is not reflected in this commit.

Manually resolved conflict for this file:
make/photon/clair/docker-entrypoint.sh
2018-07-13 11:06:17 +08:00
Daniel Jiang
18c3565cbc
Merge pull request #5247 from vmware/stonezdj-patch-1.5.2
Update VERSION
2018-07-04 17:40:37 +08:00
stonezdj(Daojun Zhang)
0f55ba5b00
Update VERSION
Update VERSION to 1.5.2
2018-07-04 16:59:36 +08:00
Daniel Jiang
3b0c8c6c4e
Merge pull request #5233 from stonezdj/release_1.5.2
Fix issue that harbor tile can not save customized settings
2018-07-02 19:31:14 +08:00
stonezdj(Daojun Zhang)
4fad4ea0ea
Merge branch 'release-1.5.0' into release_1.5.2 2018-07-02 18:41:24 +08:00
stonezdj
31dc7749ad Fix issue that harbor tile can not save customized settings 2018-07-02 18:33:13 +08:00
Yan
8bbd84ea00
Promote version to v1.5.1 (#5063) 2018-05-31 14:28:39 +08:00
Daniel Jiang
a15738d98f
Merge pull request #5004 from ywk253100/180521_log
Log error message in server side
2018-05-22 11:35:53 +08:00
Wenkai Yin 79628
34d6e9b653 Log error message in server side
Record the errors which are only returned to frontend in the server side for easy debugging.
2018-05-21 14:57:43 +08:00
Steven Zou
63bb9914dd
Merge pull request #4980 from ninjadq/cherry-pick_deploy_button_optimization_to_1.5
Deploy button send event based on latest tag
2018-05-21 13:21:18 +08:00
Deng, Qian
3160e02c58 Deploy button send event based on latest tag
If latest tag exist sent provision event. Otherwise send Add additional info event.
2018-05-17 17:18:22 +08:00
Steven Zou
6b101af4a9 Cherry-pick: Improve the error handling capabilities of job service (#4915)
* Return none zero code when job service exit with error
replace fmt.Println/logger.Errorf with logger.Fatal(f)

* Add retry for getting configs from admin server when doing job conetxt initialization
2018-05-11 13:31:51 +08:00
Daniel Jiang
3346ed8069
Merge pull request #4913 from reasonerjt/fix-uaa-admin-1.5
Sync user info after UAA user is logged in - cherry pick to 1.5 branch
2018-05-10 23:56:56 +08:00
Daniel Jiang
992305bbaa
Merge branch 'release-1.5.0' into fix-uaa-admin-1.5 2018-05-10 19:37:11 +08:00
Daniel Jiang
0ca79dba96
Merge pull request #4906 from stonezdj/remove_debug_test
Delete debug.test -- Cherrypick 1.5
2018-05-10 17:32:59 +08:00
Daniel Jiang
1df4fd1e7a
Merge branch 'release-1.5.0' into remove_debug_test 2018-05-10 16:56:47 +08:00
Daniel Jiang
3d1d48112c
Merge branch 'release-1.5.0' into fix-uaa-admin-1.5 2018-05-10 16:55:23 +08:00
Steven Zou
f31deea60a
Merge pull request #4911 from steven-zou/pickup_msg_server_restart_fix
Cherry-pick: Fix the issue of intermittent restarting of job service
2018-05-10 16:39:31 +08:00
Steven Zou
299ff17437 Fix the issue of intermittent restarting of job service
github issue: #4712
ping redis server before pool starting

Let worker pool to restart the message server if message server exits with error (controlled by max retries)
2018-05-10 15:17:45 +08:00
stone
146f1de28b
Delete debug.test 2018-05-10 14:13:13 +08:00
Tan Jiang
a9d0decaba Sync user info after UAA user is logged in
This is a fix to #4895.
Currently the user data will not be populated correctly after a user in
UAA is logged in.  This problem is fixed in this commit.
2018-05-10 11:10:59 +08:00
Daniel Jiang
d59c257eaa
Merge pull request #4852 from ywk253100/180502_migration_cherrypick
Fix bug #4840
2018-05-02 23:17:04 +08:00
Daniel Jiang
107fd05f22
Merge pull request #4831 from reasonerjt/release-1.5.0
Overwrite values of 'redis_url' and 'max_job_workers'
2018-05-01 10:00:03 +08:00
Tan Jiang
2d372ad1ad Set default value to 'redis_url'
The default value of 'redis_urli needs to be set in .tpl because it
exists in previous version of harbor.cfg
2018-05-01 09:27:30 +08:00
Daniel Jiang
8b08510688
Merge pull request #4829 from wy65701436/fix-migrator
Add default value for redis_url in v1.5.0 migrator
2018-05-01 08:04:19 +08:00
wangyan
2a5fcbf87b Add default value for redis_url in v1.5.0 migrator 2018-04-30 09:57:01 -07:00
Daniel Jiang
9ee97d1b08
Merge pull request #4825 from reasonerjt/release-1.5.0
Collect log of redis - cherrypick to 1.5 branch
2018-04-30 19:34:40 +08:00
Daniel Jiang
0b839623c1
Merge branch 'release-1.5.0' into release-1.5.0 2018-04-30 19:05:30 +08:00
Tan Jiang
762d29f701 Collect log of redis
Previously the log file was set to a hard coded file, but given this
redis should run in container, the update is made to have the process
output log messages to standard output, and redirect it to syslog in
docker-compose template.
2018-04-30 18:18:39 +08:00
Wenkai Yin
7216c6a7f4
Merge pull request #4820 from ywk253100/180430_delete_rule
Fix bug #4819: the scheduled rule can not be removed
2018-04-30 18:17:23 +08:00
Daniel Jiang
42566fe9bf
Merge pull request #4815 from ninjadq/fix_url_hardcode_on_replication
Fix URL hardcode on replication service
2018-04-30 14:48:45 +08:00
Wenkai Yin
4fc5cfc354 Fix bug #4840
Fix the bug: upgrade failed in VIC if replication policies exist
2018-04-29 15:29:21 +08:00
Deng, Qian
34bfe8104d Fix URL hardcode on replication service
Url hardcoded in replication service. This commit is to fix it.
2018-04-29 15:12:53 +08:00
Wenkai Yin
e8a7e5afb4 Fix bug #4819: the scheduled rule can not be removed
When checking the jobs of the rule which are going to be deleted, only get the transfer and delete jobs.
2018-04-28 18:07:28 +08:00
Steven Zou
c4afac8460
Merge pull request #4813 from pengpengshui/upstreamLabelFilter
Cherry pick add sort fun when filter label in tag page
2018-04-27 23:07:03 +08:00
pfh
3839b39706 Modify harbor-ui version 2018-04-27 18:15:42 +08:00