Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-18 08:15:16 +01:00
Code Issues Projects Releases Wiki Activity
7,336 Commits 49 Branches 316 Tags 351 MiB
fe3c71094b
Commit Graph

244 Commits

Author SHA1 Message Date
Daniel Jiang
ba4c7f5731
Merge pull request #4514 from yixingjia/usemonitorapi 
Use new health check api for docker files
 2018-04-08 10:03:49 +08:00
Steven Zou
44808650be Merge branch 'master' into job_service 2018-04-03 16:28:26 +08:00
Daniel Jiang
53cea404fd
Merge pull request #4523 from ninjadq/migrator_1_5 
Upgrade migrator to 1.5.0
 2018-04-02 09:25:11 +08:00
Deng, Qian
93c96da18b Upgrade migrator to 1.5.0 2018-03-30 22:45:32 +08:00
Steven Zou
250360307b Modify docker compose file template and make file to enable new job service 
Fix typo in Makefile under photon

Fix version tag issue of redis container

Assign container name for redis container

Update docker compose template to enable network for redis

Remove exposed ports of redis from compose yaml tpl
 2018-03-30 16:52:55 +08:00
Steven Zou
d5a696d821 Merge branch 'master' into job_service 2018-03-30 11:23:20 +08:00
Steven Zou
afd3ffd63c
Merge pull request #4472 from yixingjia/redisserver 
Add Redis docker file
 2018-03-30 11:21:23 +08:00
Steven Zou
d1899c840d Merge branch 'master' into job_service 2018-03-29 23:25:20 +08:00
yixingj
22f682c020 Use new health check api for docker files 
ui
nginx
adminserver
postgresql
 2018-03-29 13:00:28 +08:00
Tan Jiang
b6df6cf169 Add indexes to job tables and bump up schema version. 2018-03-28 16:15:54 +08:00
Tan Jiang
745b21abbc Merge remote-tracking branch 'upstream/master' into scan-job-migrate 2018-03-26 15:39:42 +08:00
stone
203b1b52bb
Merge pull request #4415 from stonezdj/user_group_and_project_member 
Add DAO for user group and project member
 2018-03-26 15:21:20 +08:00
Daniel Jiang
93568854d9
Merge pull request #4474 from reasonerjt/job_uuid 
Update SQL script to add uuid to job tables.
 2018-03-26 15:17:53 +08:00
stonezdj
49d960b060 Add DAO for project member and user group 2018-03-26 14:38:32 +08:00
Tan Jiang
381ecc3521 Merge with master 2018-03-26 10:37:17 +08:00
Tan Jiang
df69f7e410 Fix error in registry_sqlite.sql 2018-03-25 13:47:03 +08:00
Jesse Hu
0b5e0aa041
Enhance registry docker file to make it work with NFS server (#4466) 2018-03-23 17:57:26 +08:00
yixingj
ee6a6af3c5 Add Redis docker file 
Add the redis docker files
 2018-03-23 17:46:43 +08:00
Tan Jiang
6f1c46624f Update SQL script to add uuid to job tables. 
We have to add the uuid/id mapping as new job service will only store uuid.

Further work is in feature branch for now, commit this change to
accelerate migration work.
 2018-03-23 17:45:50 +08:00
Tan Jiang
7238efd9ae Integrate new jobservice into docker-compose template 
This commit doesn't integrate redis.  No change to makefile b/c it
should work once the temporary jobservice_v2 folder is renamed to jobservice.
 2018-03-22 19:48:22 +08:00
Daniel Jiang
f885de0913
Merge pull request #4449 from ywk253100/180314_filter_by_label 
Add unique constraint to columns label_id, resource_id, resource_name and resource_type in table harbor_resource_label
 2018-03-21 18:37:04 +08:00
Wenkai Yin
83cfe9814d Add unique constraint to columns label_id, resource_id, resource_name and resource_type in table harbor_resource_label 2018-03-21 16:24:21 +08:00
Yan
5edbd00318
Revise harbor build version (#4445) 2018-03-21 13:03:49 +08:00
Wenkai Yin
838b439560 Implement filter repository and tags by label API 2018-03-21 10:51:06 +08:00
Wenkai Yin
bcf81224ad Update according to the comments 2018-03-14 13:42:19 +08:00
Wenkai Yin
36b9c4e458 Implement adding/removing labels to/from repositories and images API 2018-03-12 19:30:05 +08:00
Wenkai Yin
379f113452 Implement label management API 2018-03-09 12:17:27 +08:00
Tan Jiang
f83c65bcc5 Reduce the output of build. 
The following are done to avoid travis-ci failing due to too much log
size.
1) Update Makefile and scripts to make go build less verbose.
2) Make tdnf less verbose
 2018-02-27 20:54:52 +08:00
stonezdj
f138067242 Refactor project member 2018-02-09 10:38:51 +08:00
Deng, Qian
b3e65ed71e Update migration tool for v1.4 
1. Update database meta file
2. Add migration file for 1.4
 2018-01-16 15:38:51 +08:00
Wenkai Yin
96a63c56b1 Merge remote-tracking branch 'upstream/master' into 180103_merge 2018-01-03 10:32:03 +08:00
wangyan
b560f6c061 Remove the workaroud for avoiding photon distro-sync error 2017-12-19 21:10:32 -08:00
wangyan
6b7df3636c Temporary workaround for photon distro-sync error 2017-12-18 22:18:21 -08:00
wangyan
1e750a1ed4 Unify images tags and build process 2017-12-14 23:52:18 -08:00
Wenkai Yin
a54b7dd4c0 Merge remote-tracking branch 'upstream/master' into 171219_merge 2017-12-15 08:48:57 +08:00
yixingj
0af4e3a41d Fix clair permission issue 
Clair will call bzr, without -H in sudo it will usr root user's
Home envrionment.
 2017-11-23 20:03:57 +08:00
Yan
bef15d6180
Merge pull request #3655 from reasonerjt/scanjob-permission-fix 
Fix permission issue in job_log directory
 2017-11-21 23:28:39 +08:00
Tan Jiang
b3e0af2382 Fix permission issue in job_log directory 2017-11-21 19:31:15 +08:00
yixingj
ceba1fd629 Fix Clair config permission issue 
Change config file own to clair
 2017-11-21 17:48:48 +08:00
reasonerjt
1f5a9cdee8 Fix issue in Docker files 
1)Fix a syntax error in clair Dockerfile
2)Fix permission issue in database migrator image.
 2017-11-16 01:15:59 -08:00
Ben Sebastian
ef14b1f308 Use dumb-init for Clair entrypoint (#3361) 2017-11-16 00:02:09 -06:00
yixingjia
effa92e7f0
Merge pull request #3605 from reasonerjt/dockerfile-refine 
Refine the Dockerfile
 2017-11-13 18:50:12 -08:00
Tan Jiang
6d7c028729 Refine the Dockerfile 
Refine the Dockerfile to remove temporary workarounds.
Also fixes #3587, to make sure the configuration files of rsyslog can be
read by uid 10000.
 2017-11-13 18:04:17 +08:00
Yan
e91fa5f7a5
Merge pull request #3489 from Evalle/fix-notary-link 
ISSUE-3460 - Fix link to Notary repo
 2017-11-13 16:19:06 +08:00
Daniel Jiang
01493508c1
Merge pull request #3589 from yixingjia/noroot_notary 
Run notary related images with user notary
 2017-11-12 22:56:59 -06:00
Evgeny Shmarnev
6c07689d85 Fix link to Notary repo 2017-11-10 11:16:37 +01:00
yixingj
12abeb0a36 Run notary related images with user notary 
1>Change the user from root to notary
2>Update the images.
 2017-11-10 14:38:41 +08:00
reasonerjt
19a13e8575 Deprivilege harbor-ui harbor-jobservice harbor-adminserver 
Use non-root user to run the service within these docker images, and provide HEALTHCHECK
mechanism.
 2017-11-09 03:09:09 -08:00
Wenkai Yin
367c2b142f
Merge pull request #3571 from ywk253100/171107_log_rotate 
Improve log rotation configurability
 2017-11-09 15:19:18 +08:00
Wenkai Yin
66b9699ac2 Improve log rotation configurability 2017-11-09 14:33:05 +08:00
Daniel Jiang
b654a55e85
Merge pull request #3546 from yixingjia/noroot_clair 
Run clair with limited user
 2017-11-08 13:51:16 +08:00
yixingj
e9d1b89936 Run clair with limited user 
1>creat user clair
2>run clair with user clair
 2017-11-08 12:31:35 +08:00
reasonerjt
9382cac934 Remove the Dockerfile of rsyslog image 2017-11-05 21:52:23 -08:00
root
6f335bdb1a Deprivilege harobr-log, harbor-db, registry image. 
This change involves using non-root user to run the process of the
docker images.  Also made update in Dockerfile to make the containers
support "read-only" and introduce "HEALTHCHECK". Note the "read-only"
options are not enabled in docker-compose, to cover the very corner
case when user wants to update the container filesystem manually.

Remove read only option from docker-compose template by default
 2017-11-02 23:35:06 -07:00
Daniel Jiang
f7967e22ab
Merge pull request #3482 from yixingjia/ossclairupdate 
Update Clair base images
 2017-11-02 14:23:33 +08:00
yixingjia
8908b75085
Merge pull request #3481 from yixingjia/ossnotaryupdate 
Update Notary base images and oss package
 2017-10-31 19:46:07 -07:00
Daniel Jiang
f7b4218022
Merge pull request #3476 from yixingjia/ossUpdateUI 
Update UI image oss package to latest
 2017-10-31 17:50:03 +08:00
yixingj
d8919f4da9 Update Clair base images 
1>update clair base iamges to vmware/photon:1.0
2>update oss packages to latest
 2017-10-30 13:50:44 +08:00
yixingj
beefb40d0d Update Notary base images and oss package 
1> Update Notary server image to vmware/photon
2> Update NOtary signer image to vmware/photon
3> update oss package to latest
 2017-10-30 13:12:47 +08:00
yixingj
d173fd7256 Update registry image oss package to latest 
1>Change base image to vmware/photon
2>update oss pakcage and remove vim package.
 2017-10-30 11:06:48 +08:00
yixingj
c4024f03a1 Update UI image oss package to latest 
Update base image to photon
Remove vim from the image
 2017-10-30 10:56:18 +08:00
Tan Jiang
2cedfff4b3 Rebuild Harbor DB docker image on top of Maria DB 
This change reworked the vmware/harbor-db image to build it on top of
vmware/mariadb-photon.
Also made minor change in the entrypoint script of mariadb image to
execute upgrade script during bootstrap, and fix a file permission
issue in the bootstrap scripts.
 2017-10-26 12:27:09 +08:00
yixingj
83a5ab2818 Update OSS package in Jobservice 
1>update OSS package in Job eservice images
2>use new photon base images
 2017-10-23 10:49:27 +08:00
yixingjia
98472237e5 Merge pull request #3389 from yixingjia/updateadminserver 
Update OSS packages in adminserver images
 2017-10-17 22:12:56 -07:00
yixingj
0f3380c3ef user change image tag to 20170928 
due to photon os images 1.0 has bugs.
fallback to 20170928, we shuld change this to 1.0
when the bug fixed.
 2017-10-17 16:55:30 +08:00
yixingj
7cf47fafc4 Update docker file 2017-10-17 15:33:07 +08:00
yixingj
882b077d2f Update OSS packages in adminserver images 
remove unneeded packages
move to vmware/photon images base
 2017-10-17 14:56:34 +08:00
yixingj
4e9e6b2641 Update adminserver software images 2017-10-17 10:54:00 +08:00
Wenkai Yin
bc3d859571 make log rotate days configurable 2017-10-16 17:09:28 +08:00
wangyan
c2e4e9aa1b remove the binary files from commit, and get them from the private repo. 2017-09-26 17:52:34 +08:00
wangyan
0aac7832eb automate scripts for notary(signer/server) docker images bases on photon 1.0, code is not based on 0.5.0 
remove the binary temp folder, just keep on binary path.
 2017-09-26 17:21:50 +08:00
Yan
408c1b429b update registry image (#3135) 
update

update
 2017-08-30 16:13:54 +08:00
wangyan
efc10127f3 update message 2017-07-26 02:22:03 -07:00
wangyan
c952db3c73 update 2017-07-24 18:32:50 -07:00
wangyan
3f831b2326 update per comments 2017-07-24 17:49:59 -07:00
wangyan
694bbef633 build registry 2017-07-24 03:21:38 -07:00
Yan
686b477775 update registry to 2.6.2 (#2851) 
rm dockerfile

update

add comments
 2017-07-24 02:19:32 -07:00
Daniel Jiang
5c8be3502c Merge pull request #2697 from yixingjia/rsyslog 
Prepare rsyslog docker based on photon
 2017-07-19 18:08:05 +08:00
Yan
7040e5ad5a Clair photon (#2721) 
* update

* update

* modify docker compose

* update tag

* update
 2017-07-10 21:00:44 -07:00
yixingj
2762eec4ed Prepare rsyslog docker based on photon 2017-07-03 17:57:46 +08:00
wy65701436
c5633f7ce8 add version support 2017-03-21 04:56:59 -07: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
Wenkai Yin
bf39b3a956 modify Makefile of Harbor based on photon (#1404) 
LGTM
 2017-02-21 13:45:12 +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
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
Tan Jiang
b868634007 update version of photon OS to 1.0 in Docker files 2016-11-21 16:15:43 +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
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
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