Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-30 04:28:17 +01:00
Code Issues Projects Releases Wiki Activity
7,020 Commits 55 Branches 321 Tags 341 MiB
01b8e3690e
Commit Graph

684 Commits

Author SHA1 Message Date
Tan Jiang
965c7a5e70 reference the patched nginx image 2017-04-07 15:07:46 +08:00
Daniel Jiang
93f5c78b4b Merge pull request #1948 from ywk253100/170406_secretkey 
Mount config to another dir, fix #1939
 2017-04-07 11:35:58 +08:00
Wenkai Yin
e60fd0530f mount config to another dir, fix #1939 2017-04-07 09:14:41 +08:00
Tan Jiang
a2726b55a8 Merge remote-tracking branch 'upstream/master' into enable-gzip 2017-04-06 15:28:41 +08:00
Tan Jiang
d527a543bd enable gzip by default 2017-04-06 14:47:41 +08:00
wy65701436
f6c4137af1 fix issue 1916 2017-04-05 22:53:09 -07:00
Daniel Jiang
7d6d641827 Merge branch 'master' into dev 2017-04-05 17:01:27 +08:00
wy65701436
b827fdd5a5 use gzip to save docker images. 2017-04-04 23:48:29 -07:00
Daniel Jiang
d49a307312 Merge pull request #1868 from reasonerjt/nginx-log-format 
update nginx log format to include response time
 2017-03-30 15:12:30 +08:00
Wenkai Yin
2528ad9c62 Merge pull request #1870 from ywk253100/170330_ca_download_dir 
Mount ca dir to UI container
 2017-03-30 13:52:27 +08:00
Wenkai Yin
ec27e2dc07 remove compress js flag 2017-03-30 12:59:47 +08:00
Wenkai Yin
ee2a6748c0 mount ca dir to container, fix #1829 2017-03-30 12:50:20 +08:00
Tan Jiang
7555dd9d48 update nginx log format to include response time 2017-03-30 12:46:13 +08:00
Tan Jiang
864e0f415e prepare should remove the temp files generated for creating certificate 2017-03-29 17:08:28 +08:00
Tan Jiang
715d87dc80 fixes #1818 2017-03-28 10:11:13 +08:00
Tan Jiang
851f61032a Do not generate new alias each time prepare runs 2017-03-24 20:05:13 +08:00
Tan Jiang
a33f4151e2 merge with dev branch 2017-03-24 14:40:34 +08:00
Yan
e2fe74598b Merge pull request #1776 from wy65701436/dev 
add -v to docker-compose down
 2017-03-24 14:05:48 +08:00
wy65701436
02431de5a4 add -v to docker-compose down 2017-03-23 22:45:01 -07:00
Tan Jiang
3e8d71538f generate cert for notary signer in prepare, 
update the default certificates so the subject is formal.
 2017-03-24 13:33:49 +08:00
Tan Jiang
90bc280ea1 add a 4443 ssl server to nginx config 2017-03-24 13:16:48 +08:00
Tan Jiang
402a482bc6 generate cert for notary signer in prepare 2017-03-23 21:00:53 +08:00
Tan Jiang
980101eab5 package vmware/registry into offline package 2017-03-23 12:36:36 +08:00
Daniel Jiang
6d013531a7 Merge pull request #1717 from reasonerjt/dev 
restrict access to notary db
 2017-03-23 11:01:01 +08:00
Tan Jiang
44cd3ec85b update make file and docker compose template 2017-03-22 20:56:08 +08:00
Tan Jiang
f9180c0c96 rebuild registry image on photon 2017-03-22 20:27:15 +08:00
Tan Jiang
3c16d6c1a1 restrict access to notary db 2017-03-22 18:15:16 +08:00
wy65701436
c5633f7ce8 add version support 2017-03-21 04:56:59 -07:00
Daniel Jiang
7f099ebe50 Merge pull request #1703 from reasonerjt/dev 
Use notary images based on photon, migrate db in notary's images
 2017-03-21 19:35:27 +08:00
Tan Jiang
6e09ae89e3 Use notary images based on photon, migrate db in notary's images 2017-03-21 18:46:10 +08:00
Wenkai Yin
383997f785 read capacity from adminserver 2017-03-21 16:28:24 +08:00
Yan
038d7dd90c Dev new ui (#1) 
* Updates for verfied tags deletion.

* Remove old UI.

* Move i18n folder.

* Updates for latest UI codes.

* make travis with latest dev code.

* update test code

* add cat log

* cat nginx

* cat nginx

* fix template error

* remove --with-notary

* remove controller test

* fix controller test bug

* modify controller test

* debug controller test

* update controller test

* update index title to harbor, discussed with Kun.

* Update package.json

* Merge latest UI changes.

* remove git
 2017-03-20 18:51:20 +08:00
Yan
43578a2a6f Merge pull request #1656 from reasonerjt/dev 
fix issue in location.conf
 2017-03-17 20:03:47 +08:00
Tan Jiang
098d7d5765 fix issue in location.conf 2017-03-17 19:44:54 +08:00
Yan
92d9f8516f Merge pull request #1626 from ywk253100/170315_registry_upgrade 
Upgrade registry to 2.6.0
 2017-03-17 18:25:22 +08:00
Tan Jiang
9d87279152 fix #1570, #1628 2017-03-16 16:09:05 +08:00
Wenkai Yin
108aa21499 upgrade registry to 2.6.0 2017-03-16 13:44:16 +08:00
Wenkai Yin
c3626edd42 reset config 2017-03-16 11:27:45 +08:00
kunw
e80840c2d3 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-13 18:23:09 +08:00
Daniel Jiang
f9e8394be9 Merge pull request #1541 from wy65701436/dev 
to support nortary
 2017-03-13 10:45:53 +08:00
wy65701436
fd5a2824b6 update per review. 2017-03-10 02:57:10 -08:00
Tan Jiang
ef906c96d0 provide systeminfo API for UI 2017-03-10 18:53:11 +08:00
kunw
1c2fcc168f Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-10 15:27:35 +08:00
wy65701436
481ba06003 support notary 2017-03-09 03:02:44 -08:00
Tan Jiang
04a5eb6606 notary containers should use syslog as log driver 2017-03-08 17:24:32 +08:00
kunw
f2a1659d96 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-08 15:36:05 +08:00
Aron Parsons
8ab45d439b label volumes for SELinux 
allow Harbor to run when dockerd is running with --selinux-enabled

example AVC denials:
type=AVC msg=audit(1488384855.681:154671): avc:  denied  { read } for  pid=454 comm="registry" name="config.yml" dev="dm-8" ino=12583048 scontext=system_u:system_r:svirt_lxc_net_t:s0:c298,c958 tcontext=system_u:object_r:default_t:s0 tclass=file
type=AVC msg=audit(1488384855.681:154671): avc:  denied  { open } for  pid=454 comm="registry" path="/etc/registry/config.yml" dev="dm-8" ino=12583048 scontext=system_u:system_r:svirt_lxc_net_t:s0:c298,c958 tcontext=system_u:object_r:default_t:s0 tclass=file
type=AVC msg=audit(1488384855.687:154672): avc:  denied  { append } for  pid=350 comm=72733A6D61696E20513A526567 name="registry.log" dev="dm-5" ino=4315920 scontext=system_u:system_r:svirt_lxc_net_t:s0:c599,c800 tcontext=system_u:object_r:default_t:s0 tclass=file
type=AVC msg=audit(1488384856.895:154702): avc:  denied  { remove_name } for  pid=708 comm="mysqld" name="4691d4d62464.lower-test" dev="dm-12" ino=402656159 scontext=system_u:system_r:svirt_lxc_net_t:s0:c149,c797 tcontext=system_u:object_r:default_t:s0 tclass=dir
type=AVC msg=audit(1488384856.926:154703): avc:  denied  { lock } for  pid=708 comm="mysqld" path="/var/lib/mysql/ibdata1" dev="dm-12" ino=402656097 scontext=system_u:system_r:svirt_lxc_net_t:s0:c149,c797 tcontext=system_u:object_r:default_t:s0 tclass=file
type=AVC msg=audit(1488384857.958:154736): avc:  denied  { open } for  pid=924 comm="harbor_jobservi" path="/etc/jobservice/app.conf" dev="dm-8" ino=142 scontext=system_u:system_r:svirt_lxc_net_t:s0:c102,c158 tcontext=system_u:object_r:default_t:s0 tclass=file
type=AVC msg=audit(1488384858.089:154737): avc:  denied  { read } for  pid=1017 comm="nginx" name="nginx.conf" dev="dm-8" ino=4194445 scontext=system_u:system_r:svirt_lxc_net_t:s0:c847,c996 tcontext=system_u:object_r:default_t:s0 tclass=file
type=AVC msg=audit(1488384858.089:154737): avc:  denied  { open } for  pid=1017 comm="nginx" path="/etc/nginx/nginx.conf" dev="dm-8" ino=4194445 scontext=system_u:system_r:svirt_lxc_net_t:s0:c847,c996 tcontext=system_u:object_r:default_t:s0 tclass=file
 2017-03-03 14:13:39 -05:00
Wenkai Yin
a4cb261df9 read some configs from env 2017-03-02 13:24:41 +08:00
kunw
dbce11ce42 Updates for node clarity build. 2017-03-01 17:14:09 +08:00
kunw
f517502193 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-02-28 12:17:34 +08:00
kunw
f01569c4dd Updates for clarity docker-compose files. 2017-02-27 22:07:39 +08:00
Tan Jiang
6454ccfc3a fix the 'v2' URL conflict issue, and remove the work around in token service code 2017-02-27 21:01:26 +08:00
Wenkai Yin
5b885a7ad6 Merge pull request #1469 from yhua123/dev 
fix #1332
 2017-02-27 19:21:25 +08:00
yhua
9f18c8458b fix #1332 2017-02-27 18:52:22 +08:00
Steven Zou
2e20a65121 Merge pull request #1458 from wknet123/harbor-clarity-integration 
Merge Harbor clarity integration to into Dev branch.
 2017-02-27 16:20:22 +08:00
kunw
46cef020eb Rename directory name. 2017-02-27 11:41:46 +08:00
Tan Jiang
7620cd3b86 refactor token service 2017-02-26 19:53:13 +08:00
kunw
23f0ff1ea5 Refactor Harbor Clarity integration code structure. 2017-02-24 17:54:50 +08:00
Wenkai Yin
9f3f48be59 add harbor network to adminserver 2017-02-24 14:35:11 +08:00
kunw
914255d6c2 Updates for docker-compose sources. 2017-02-24 14:12:45 +08:00
Wenkai Yin
414e8a8bcf Merge remote-tracking branch 'upstream/dev' into 170224_merge_config 
Conflicts:
	make/docker-compose.tpl
	src/ui/service/token/authutils.go
 2017-02-24 13:52:19 +08:00
Wenkai Yin
a1858098c5 using different secret to mark himself when communicates with other components 2017-02-23 18:24:32 +08:00
Daniel Jiang
ef34b96256 Merge pull request #1422 from ywk253100/170221_secretkey 
Encrypt the passwords in configuration file
 2017-02-23 10:25:39 +08:00
kun wang
f4d35414d2 Merge pull request #1425 from wknet123/harbor-clarity-integration 
Updates for building node-clarity image.
 2017-02-22 18:31:42 +08:00
kunw
bb674ea977 Updates for building node-clarity image. 2017-02-22 18:30:37 +08:00
Wenkai Yin
40eb6bb7d3 encrypt passwords enhancement 2017-02-22 16:59:28 +08:00
kunw
3a621faba3 Fixed some issues and merged latest codes. 2017-02-22 13:03:05 +08:00
Steven Zou
668f39c732 Merge pull request #1419 from wknet123/harbor-clarity-integration 
Fixed some issues and merged latest codes.
 2017-02-22 12:27:28 +08:00
Steven Zou
e829b04f1f Merge pull request #1407 from wknet123/harbor-clarity-integration 
Harbor Clarity UI integration.
 2017-02-22 11:26:23 +08:00
kunw
3c112f2a2c Harbor Clarity UI integration. 2017-02-21 14:54:42 +08:00
Wenkai Yin
bf39b3a956 modify Makefile of Harbor based on photon (#1404) 
LGTM
 2017-02-21 13:45:12 +08:00
Tan Jiang
8cbfffa9c8 deploy notary within Harbor 2017-02-20 19:31:28 +08:00
Tan Jiang
c3c1b84ed1 preparae --conf instead of -conf 2017-02-20 13:21:29 +08:00
Wenkai Yin
390f89ee0a encrypt passwords and secret 2017-02-17 18:23:21 +08:00
Daniel Jiang
a17cd5bcfe add a default network for containers in harbor (#1384) 
LGTM
 2017-02-16 14:51:21 +08:00
Wenkai Yin
2e3174f404 update 2017-02-15 15:28:50 +08:00
Wenkai Yin
06519bb3f2 update 2017-02-13 17:17:46 +08:00
Wenkai Yin
6dc6b4fa79 update Makefile 2017-02-10 17:03:21 +08:00
Tan Jiang
27802f7620 Merge branch 'master' into dev 2017-01-24 12:16:53 +08:00
Wenkai Yin
f1f78a5649 update 2017-01-19 17:56:08 +08:00
Kira
00259567a8 update kubernetes deployment 2017-01-16 12:06:35 +08:00
Wenkai Yin
75f660fa77 Merge remote-tracking branch 'upstream/dev' into 161228_config 
Conflicts:
	make/common/templates/ui/env
	src/ui/auth/ldap/ldap.go
	src/ui/config/config.go
 2017-01-12 17:41:14 +08:00
Wenkai Yin
b62a958250 configure harbor 2017-01-12 17:15:32 +08:00
yhua
4c213a8717 remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3) 2017-01-04 17:48:20 +08:00
Ricardo Katz
160e22f0fe Changes LDAP Library and other LDAP improvements (#1277) 
* Changes LDAP library to go-ldap and creates new ldap timeout directive

* Add support for connection on LDAP using TLS
 2016-12-30 16:03:30 +08:00
Wenkai Yin
111638ae8e Merge pull request #1249 from yhua123/dev-update-registry 
update registry from 2.5.0 to 2.5.1
 2016-12-16 18:03:53 +08:00
Wenkai Yin
3717b37dca Merge pull request #1251 from yhua123/dev-update-golang 
upgrade golang baseimage from 1.6.2 to 1.7.3
 2016-12-16 17:27:24 +08:00
yhua
0249f2181a update registry from 2.5.0 to 2.5.1 2016-12-15 16:50:50 +08:00
yhua
10306e784b upgrade golang baseimage from 1.6.2 to 1.7.3 2016-12-15 13:16:14 +08:00
yhua123
0d09379fb7 Merge branch 'dev' into dev 2016-12-12 15:11:00 +08:00
yhua
90be98bc5d add 'data_volume' in harbor.cfg 2016-12-12 14:35:28 +08:00
Wenkai Yin
d6d4711700 1.fix issue: deleting repo action will fall in deadlock between two Harbor if they are configured to sync to each other 2. Filter notification request in nginx 2016-12-09 18:10:20 +08:00
dejwsz
719072e0ba remove rsyslogd.pid before start to allow container restarts 
This change mitigate problems with container restarts (stop, start) or automatic restart after host machine restart. Rsyslogd strictly checks existence of its pid file and won't start if such one exists.
 2016-12-01 15:31:14 +01:00
kunw
dc6d3e552c Update comment. 2016-11-24 17:50:41 +08:00
kunw
4d916e7127 Update for email_identity setting. 2016-11-24 15:48:36 +08:00
Tan Jiang
b868634007 update version of photon OS to 1.0 in Docker files 2016-11-21 16:15:43 +08:00
Tan Jiang
35407d12db update TOKEN_URL to TOKEN_ENDPOINT 2016-11-18 16:37:46 +08:00
Wenkai Yin
8523db5427 make cert dir 2016-11-17 16:14:22 +08:00
Wenkai Yin
e4bf4af9ba mkdir if it does not exist 2016-11-17 15:09:12 +08:00
Wenkai Yin
f867ff42a0 Merge pull request #1099 from ywk253100/161115_https 
Generate self-signed certificate
 2016-11-17 12:59:28 +08:00
Daniel Jiang
ffbe980622 Merge pull request #1101 from reasonerjt/config-refactory 
Config refactory
 2016-11-16 22:00:20 +08:00
Wenkai Yin
ce56ff2fae generate self-signed certificate 2016-11-16 21:42:31 +08:00
Tan Jiang
5ea0e50f0f reset to default value in harbor.cfg 2016-11-16 20:42:29 +08:00
Tan Jiang
9d7a18a0a3 fix issue in golint, support project creation restriction at backend 2016-11-16 20:31:04 +08:00
kunw
e367ec24a8 Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-16 14:23:27 +08:00
Tan Jiang
0e3cb2e3f4 ui config refactory 2016-11-16 13:33:14 +08:00
Tan Jiang
c34b2872bc config refactory for common pkg 2016-11-16 13:33:14 +08:00
kunw
c1c5ba8157 Update for adding timestamp to JS file name to avoid browser cache. 2016-11-14 18:27:56 +08:00
Daniel Jiang
0025134a91 Merge pull request #1039 from yhua123/dev 
modify prepare for genrate all common/config files from template
 2016-11-11 22:38:44 +08:00
yhua
20873a9d17 remove 2 cert file delete action, already delete previous 2016-11-11 16:08:49 +08:00
Daniel Jiang
a44a399761 Merge pull request #1046 from ywk253100/161109_cert_path 
Fixes #1002
 2016-11-10 08:26:17 +08:00
yhua
f19e19eaf0 move root.crt and private_key.pem to template 2016-11-09 18:21:28 +08:00
Wenkai Yin
5d183da0f9 fixes #1002 2016-11-09 18:12:00 +08:00
kunw
55b98f9abd Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-09 14:53:26 +08:00
kun wang
126b7fae55 Merge pull request #1023 from fillet54/add-mail-identity-config 
Make mail identity configurable
 2016-11-09 14:35:09 +08:00
yhua
09b62157cf modify prepare for genrate all common/config files from template 2016-11-08 17:40:19 +08:00
Daniel Jiang
5a0c203557 Merge pull request #1017 from reasonerjt/dev 
set secure flag for cookie
 2016-11-07 11:01:40 +08:00
Phillip Gomez
0dfce1d837 Make mail identity configurable 
The identity field parameter passed to smtp.SendMail is now
configurable instead of being hardcoded to 'Mail Config'.

This fixes issue #900
 2016-11-06 18:05:46 -08:00
Tan Jiang
b92b1036bf set secure flag for cookie 2016-11-05 00:08:37 +08:00
Wenkai Yin
018b32a1b4 update nginx in Makefile 2016-11-03 14:48:50 +08:00
Wenkai Yin
4fcfffeb47 upgrade nginx to 1.11.5 2016-11-02 15:49:28 +08:00
kunw
560b41b5e6 Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-02 12:46:57 +08:00
Tan Jiang
7f55520b27 Merge remote-tracking branch 'upstream/dev' into dev 2016-10-28 22:44:59 +08:00
Tan Jiang
b75844e622 update ciphers for nginx 2016-10-28 18:48:12 +08:00
Daniel Jiang
098643303f Merge pull request #952 from ywk253100/161026_log_rotate 
Log rotate
 2016-10-28 12:59:54 +08:00
Wenkai Yin
0689935da4 log rotate 2016-10-26 18:26:02 +08:00
yhua
a6e7a6ba45 fix baseimage issue 2016-10-26 13:46:22 +08:00
yhua
03e2a3ee56 remove tag in docker-compose.yml 2016-10-26 13:09:12 +08:00
kunw
811401f40e Added volume info of UI. 2016-10-25 12:44:27 +08:00
yhua
271787dd94 update for fix #925 2016-10-24 16:51:42 +08:00
yhua
ebc852b7cc fix #924 #925 2016-10-24 16:48:48 +08:00
yhua
1043ec063d rm binary 2016-10-24 14:18:56 +08:00
yhua
69797c30f2 fix pushimage, update .gitignore, add DEVFLAG 2016-10-24 14:06:23 +08:00
yhua
311cf8da07 change code 20161019 2016-10-21 18:39:10 +08:00