Daniel Jiang
cfc95c69e6
Fix failure of running prepare with python3
...
This commit fixes #5053 .
It removes the usage of `string.strip` which will fail in python3.
2018-06-13 18:17:00 +08:00
Daniel Jiang
ccbd23d14e
Change owner of the secret file in prepare script
...
The secretkey file will be loaded by adminserver which is run by non-root
user (uid:10000) previously the entrypoint script will run `chown` to a
lot files, and there's a breakage in upgrade when we skip running
`chown` inside container.
This commit will fix the issue during upgrade by changing the owner of
the secretkey file.
2018-06-08 16:43:16 +08:00
Wenkai Yin 79628
0c56493fb6
Soft delete label
...
Modify the deletion of label to soft deletion, in this way the names of deleted labels referenced by replication rules can be shown to users
2018-06-07 17:14:12 +08:00
Yan
6d800cabbd
enable migrator to support 1.5.0 migration from mysql to pgsql ( #5029 )
...
This commit is to enable data migrator to support migrates data
from mysql to pgsql, this is a specific step for user to upgrade
harbor across v1.5.0, as we have move harbor DB to pgsql from
1.5.0. It supports both harbor and notary db data migration,
and be split into two steps with dependency.
It also fix issue #4847 , add build DB migrator in make process.
2018-06-01 14:58:43 +08:00
Daniel Jiang
9f13453d5f
chown only to the folder to store the config.json ( #4978 )
...
Narrow down the scope of `chown` in adminserver because the
/etc/adminserver/config/ is the location to store the config.json file.
And /etc/adminserver/key should be readonly.
2018-05-16 15:36:22 +08:00
Deng, Qian
282a63f57f
Fix legacy issues that html and css file are written on ts file.
...
Currently, our html and css files are written as string on .ts file. This pr is to solve the legacy issue.
2018-05-10 18:39:48 +08:00
Tan Jiang
5ff07cf619
Fix permission issue on VIC appliance
...
The job logs directory's permission is not changed by prepare script
because the everything is moved from /data to /storage/data on VIC
appliance. This commit will make sure both cases the directory is
readable by user 10000:10000.
This PR also makes sure the config json of notary signer has 0644
permission.
2018-05-06 22:02:19 +08:00
Tan Jiang
21ec4808ec
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:16:11 +08:00
Wenkai Yin
fa8bbe821a
Modify unique constraint of table harbor_label in pgsql ( #4811 )
...
Add unique constraint to column name, scope and project_id of table harbor_label to make creating same name labels under different projects valid
2018-04-27 08:01:20 -07:00
Yan
ae257433cc
Fully migrate harbor db to postgresql ( #4689 )
...
* Merge harbor db to postgres
2018-04-27 02:27:12 -07:00
Wenkai Yin
73babbf1ab
Modify unique constraint of table harbor_label
...
Add unique constraint to column name, scope and project_id of table harbor_label to make creating same name labels under different projects valid
2017-12-19 22:15:56 +08:00
Tan Jiang
1fc4142e1a
Do not call chown
to config files
...
This commit fixes a recently discovered issue on Kubernetes #4496
It make necessary to avoid calling `chown` to config files during the
bootstrap of the containers.
2018-04-20 13:44:21 +08:00
Steven Zou
9d13842a29
Fix the issue of missing copying the setting.json to container image ( #4714 )
...
add `cp ./src/setting.json ../ui/static/`
2018-04-18 17:43:24 +08:00
Steven Zou
43018dc755
Update the entrypoint script of clarity builder image to fix customized image copying issue
2018-04-17 19:10:43 +08:00
Steven Zou
ca8d3bdcc9
Merge pull request #4638 from vmware/use_redis_url_addr
...
Use redis URL address to replace host:port when connecting to redis server
2018-04-17 10:12:51 +08:00
Steven Zou
adc2f8f124
Use redis URL address to replace host:port when connecting to redis server
...
replace tcp host:port with
'redis://arbitrary_usrname:password@ipaddress:port/database_index'
update prepare to generate config yaml file of job service based on harbor.cfg
update harbor.cfg default values
2018-04-13 19:19:56 +08:00
yixingj
221a8b0892
Update HA tempalte
...
Update the template.
Update the installation guide.
2018-04-13 11:12:48 +08:00
Yan
946b4b4ad8
Update harbor default log level to info ( #4639 )
2018-04-12 19:04:44 +08:00
Daniel Jiang
ebc9d04479
Merge pull request #4624 from yixingjia/clairdbconfigurable
...
Add dbname paramter in dburl
2018-04-11 18:43:52 +08:00
yixingj
5b7f176c1d
Add dbname paramter in dburl
...
add dbname to dburl
2018-04-11 17:38:45 +08:00
Steven Zou
a7c2e049cc
Update the worker concurrency of job service from 10 to 50 to improve performance
2018-04-11 17:12:09 +08:00
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
Jesse Hu
debcf7858a
Merge pull request #4521 from vmware/clair-http-proxy
...
Add http_proxy configuration for Clair service
2018-03-29 14:04:34 +08:00
yixingj
22f682c020
Use new health check api for docker files
...
ui
nginx
adminserver
postgresql
2018-03-29 13:00:28 +08:00
Jesse Hu
87c622141b
Add http_proxy configuration for Clair service
...
Clair needs Internet access to download vulnerabilities data.
Fix issue https://github.com/vmware/harbor/issues/4272
2018-03-28 18:49:40 +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
41ce0891ab
Trigger scan job from UI.
2018-03-26 18:07:21 +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
yixingj
cb64ad96ff
Make endpoint configurable
...
Move all the endpoint to harbor.cfg
2018-03-26 10:50:18 +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
Yan
cbcca015b0
add read only mode to stop docker push ( #4433 )
2018-03-23 03:16:08 -07: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