Commit Graph

148 Commits

Author SHA1 Message Date
wang yan b3918fe748 Add the encoding to the data converter script
This commit is to fix bug reported by community to upgrade v1.6.0, for the details
just refer to #5788. The fix is to add the encoding(utf-8) for the converter when to convert
the mysql data to pqsql data. Already passed on test with Chinese/Japanese.

Signed-off-by: wang yan <wangyan@vmware.com>

update
2018-09-04 12:02:48 +08:00
wang yan f8b964d8cf Extend configuration length to 1024 in DB
Signed-off-by: wang yan <wangyan@vmware.com>
2018-08-31 13:42:24 +08:00
Daniel Jiang 1d4f991901
Merge pull request #5640 from wy65701436/deprecate-ova
deprecate ova for harbor repository
2018-08-24 13:38:42 +08:00
wang yan aacbf229d6 deprecate ova for harbor repository
This commit is to remove the document/tests of ova from harbor repository as decide to deprecate
ova installer in the future release.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-08-24 13:05:01 +08:00
Qian Deng ee9e80ddb1 Delete uilib directory
Not need publish version after ci suceess any more, so remove them

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-08-23 17:54:54 +08:00
Daniel Jiang bda3878ab8 Update registry image to enable inject root cert
In some user's environment, there's local object storage hosted with
self-signed certificate.
Because registry process runs in a photon container, it has to trust
the certificate in the photon level such that the registry can access
the storage service.

This commit updates the registry image to append custom cert to the root
bundle when the container is started.  And make the customer cert
configurable in `harbor.cfg`

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-08-16 18:36:21 +08:00
Daniel Jiang 3dc95ee7e2 Update CFG migrator to match the new redis setting (#5567)
There's a limitation in the new harbor.cfg file the redis url will be
hard coded to the internal redis instance.  We expect user to manually
edit the .cfg file if he's using a customized redis, this would be a
very rare case.  We'll mention it in the release note of 1.6
2018-08-09 15:30:35 +08:00
wangyan 063e44c486 Remove the tdnf error eater in docker files 2018-08-07 22:58:01 -07:00
wangyan e89f72e081 Add default value for creation time and update time trigger
These chanes are introduced by PR 5430, please refer to the PR for details
2018-07-30 23:48:46 -07:00
wangyan 22411cf6b2 Fix pgsql creation column bug
Root cause: Use default 'now'::timestamp will not generate timestamp for each transaction,
PG will convert now to a timestamp as soon as the constant is parsed. To fix it, update it
to defult CURRENT_TIMESTAMP, thie setting is the same as default now(), which returns the
start time of current transaction because ther are fuction calls, hey will give the desired
behavior of defaulting to the time of row insertion.

Reference: https://www.postgresql.org/docs/9.6/static/functions-datetime.html#FUNCTIONS-DATETIME-CURRENT
PG version: 9.6.9
2018-07-30 04:58:44 -07:00
Daniel Jiang 46de1432f2 Enable cfg migrator to 1.6.0
In 1.6, there will be only one DB process in the default deployment.
The migrator will try to handle the setting by "guessing" whether Harbor
was pointed to external DB.

Verified 1.5->1.6 and 1.4->1.6 migration.
2018-07-27 17:11:45 +08:00
wangyan 5b492ee321 Update migrator for support new table admin_job 2018-07-24 20:29:56 -07:00
Daniel Jiang 6c664ee993 Update photon base images (#5346)
This commit update the base photon image from vmware/photon:1.0 to
photon:1.0, per suggestion by photon team.
2018-07-19 20:45:20 +08:00
Deng, Qian edbe2fe620 Update migrator to 1 6 0
1. Add new alembic_pg folder for postgres
2. Add migration file for 1.6.0
3. Update version to 1.6.0
4. update migrator dockerfile
2018-07-02 21:23:47 +08:00
wangyan 2379123ff7 fix up clair issue and typo 2018-06-10 23:33:37 -07:00
wangyan 8d4d1582a3 add checking for clair DB migration 2018-06-10 20:15:55 -07:00
wangyan c7a54e115c Add clair data migration in DB migrator 2018-06-08 01:49:28 -07: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
Wenkai Yin 5f58c01e4a Fix bug #4840 (#4851)
Fix the bug: upgrade failed in VIC if replication policies exist
2018-05-02 09:37:35 -07:00
wangyan 2b3d70357e Overwrite some attributes in harbor.cfg 1.5
The values of "redis_url" and "max_job_workers" should be set to new
values due to new implementation.
2018-05-01 09:28:29 +08: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
Yan bc473f8521
Enable output parameter in harbor migrator (#4561) 2018-04-02 03:04:00 -07:00
Daniel Jiang 3f46df8087
Merge pull request #4560 from reasonerjt/cfg-upgrade-fix
Refine the migrator
2018-04-02 14:22:37 +08:00
Tan Jiang 8b9a67fe1e Update harbor.cfg template to contain latest change 2018-04-02 13:01:55 +08:00
Tan Jiang 1e260b59fe Refine the python file to make it run on python3 2018-04-02 12:34:12 +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
Yan 5bbbb06807
add all in one migrator scripts (#4511) 2018-04-01 08:53:21 -07:00
Deng, Qian 93c96da18b Upgrade migrator to 1.5.0 2018-03-30 22:45:32 +08:00
Tan Jiang b1923bf219 Refine the python file to make it run on python3 2018-03-30 14:41:12 +08:00
Daniel Jiang 24dfad4afe Return zero when input version is same as target (#4535) 2018-03-29 23:17:07 -07:00
Tan Jiang 2debdb7229 Return zero when input version is same as target 2018-03-30 11:34:51 +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 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 421bd182bc Update DB changelog to reflect schema change for user group 2018-03-21 16:45:21 +08:00
Tan Jiang c8265a8d53 Provide migration scripts for harbor.cfg
Default target version is 1.5.0
This is mainly for VIC-appliance upgrade, and should be considered
experimental for oss due to limited test.
Tested with 1.2 and 1.3 harbor.cfg from VIC appliance.
2018-03-16 14:38:50 +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
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 665a54edc3 Merge remote-tracking branch 'upstream/master' into 171213_merge 2017-12-13 13:40:24 +08:00
yixingj 9b03c93afd Add database driver for Harbor configurations
1>Add a new database driver for configurations
2> change the current default driver from json
to database
2017-12-06 13:06:54 +08:00
Wenkai Yin 6b0ee138e5 Implement immediate trigger and the methods of WatchList 2017-11-27 14:23:21 +08:00
Deng, Qian f55c0f03b5 build & publish npm package for VIC after ci 2017-11-22 20:01:00 +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
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
Deng, Qian f2868f2033 fix issue when upgrade from 1.2.0rc1 to 1.3.0 2017-11-10 18:19:36 +08:00
wangyan 28834fedf7 Add description for VIC 1.2 migration scripts 2017-11-06 01:16:17 -08:00
Deng, Qian 5ffa192b79 db migration from 1.2.0 to 1.3.0 2017-11-02 17:43:10 +08:00
Wenkai Yin 51d5df0849 Update replication policy API to support trigger and filter 2017-11-02 14:59:26 +08:00
Tan Jiang ad585499a0 Move DB migrator image to be based on Maria DB on photon 2017-10-26 17:08:12 +08:00
Wenkai Yin 2156750b04 Move certificate verification to target level
The certificate verification is on system level before this commit. Moving it
to target level makes the configuration more flexible for different targets.
2017-10-20 15:36:56 +08:00
Wenkai Yin 66b2d0d3f3 Apply project level policies to standalone Harbor
The following features are only enabled in integration mode, this commit moves
these to standalone Harbor:
 - Content trust policy: only signed images can be pulled
 - Vulnerability policy: only images whose severity is below the threshold can be pulled
 - Automatic scan policy: automatic scan pushed images
2017-10-19 17:33:28 +08:00
Wenkai Yin e495357d98 implement the default project metadata manager 2017-09-28 16:17:51 +08:00
Yan b0adf7e8d4 fix upgrade issue (#3171)
update

update

update
2017-09-07 22:50:38 +08:00
Yan c54f55bdff update migrator (#2988)
update

update
2017-08-22 15:47:53 +08:00
wangyan 0ae6becabc update db scheme
update

update
2017-08-17 16:41:20 +08:00
wangyan 77fa363992 add ignore ssl 2017-07-31 17:29:19 +08:00
wangyan ebda8363f2 update import to load token from file
update
2017-07-26 01:28:05 -07:00
Yan fd473cbaa0 update DB Migrator according latest change. (#2763)
* update DB Migrator according latest change.

update format

update

add import

update

return the rc from container

update

update to false

* add user_id
2017-07-24 19:48:12 -07:00
wangyan bdf4641c43 update user realname
update
2017-07-05 03:43:21 -07:00
Yan d849c36e3f Merge pull request #2570 from samifruit514/master
Allow 255 chars for Realname
2017-07-05 03:17:57 -07:00
wangyan c986c33a6c 1.2.0 DB migration
update

update
2017-06-30 03:01:56 -07:00
Archambault, Samuel 18cea61121 Allow 255 chars for Realname 2017-06-19 13:54:21 -04:00
Wenkai Yin 1e28f01365 delete foreign key 2017-05-10 18:28:19 +08:00
Wenkai Yin 3be9cca0f5 delete column user_id from table accesslog 2017-05-03 14:18:07 +08:00
Wenkai Yin 4f9d9ed5d8 delete owner_id column from table repository 2017-05-02 14:57:07 +08:00
wangyan b061efdeb8 add 1.1.0.1 support
update 1.1.x

update 1.1.x
2017-04-24 23:49:27 -07:00
wy65701436 9913f84269 add copy right script 2017-03-30 01:22:17 -07:00
wy65701436 b7340ebbce add ove upgrade script 2017-03-27 03:57:01 -07: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
Wenkai Yin ad4da5f043 fix cerrificate bundle issue. (#1266)
LGTM
2016-12-26 15:49:53 +08:00
yhua 10306e784b upgrade golang baseimage from 1.6.2 to 1.7.3 2016-12-15 13:16:14 +08:00
Wenkai Yin bad8835c79 fix exposure issue when collecting logs 2016-12-06 14:54:49 +08:00
Wenkai Yin 65a2c87a7c fixes: root password contains special characters 2016-12-05 12:16:27 +08:00
Wenkai Yin 01dc77b606 escape special characters used in sed 2016-12-04 16:35:47 +08:00
Wenkai Yin f4e0d3c774 remove the workaround of DNS issue 2016-12-02 14:29:52 +08:00
Wenkai Yin 3e35597dd0 push photon to project library 2016-11-29 17:17:01 +08:00
Wenkai Yin 4149e74b00 ova dns 2016-11-29 13:17:56 +08:00
Daniel Jiang fddb325e16 Merge pull request #1164 from ywk253100/161125_iptable
Fix iptable modification conflict
2016-11-28 00:05:14 +08:00
Wenkai Yin 1559d927a4 fix iptable modification conflict 2016-11-25 14:03:44 +08:00
Wenkai Yin 0b3938b411 workaround for dns and hostname issue 2016-11-23 19:59:53 +08:00
Wenkai Yin a02f8f5740 1. copy ca to download directory if nedded 2.add IP to san 3.ignore harbor admin password and database password in subsequent boot 2016-11-18 14:13:00 +08:00
Wenkai Yin 74e2984f9c modify msg of certificate 2016-11-17 18:39:17 +08:00
Wenkai Yin ce56ff2fae generate self-signed certificate 2016-11-16 21:42:31 +08:00
Wenkai Yin 1dfd130c31 fixes #995, fixes #1047 2016-11-11 18:26:09 +08:00
Wenkai Yin 94e3f1b9ae fixes #1045 2016-11-10 16:22:26 +08:00
Wenkai Yin 5d183da0f9 fixes #1002 2016-11-09 18:12:00 +08:00
Daniel Jiang 8e0d1748a2 Merge pull request #1030 from ywk253100/161104_ova
OVA
2016-11-08 16:52:59 +08:00
Wenkai Yin 80da0ffea8 1.Add script to collect logs and configurations 2.Add OVA option to enable/disable root login 2016-11-07 17:40:41 +08:00
Daniel Jiang 333c616285 Merge pull request #1024 from reasonerjt/migration_rework
migration-tool rework
2016-11-07 13:12:54 +08:00
Tan Jiang c26279d3b9 remove useless log 2016-11-07 11:51:19 +08:00
Daniel Jiang eb44e889c3 Merge pull request #1008 from yhua123/dev
Dev
2016-11-07 11:33:21 +08:00
yhua 0bcd770a03 delete delete unused lines 2016-11-03 16:50:37 +08:00
yhua 88b122a777 add document for make process and build local golang image into Makefile 2016-11-02 17:29:12 +08:00
Wenkai Yin 52edcd8f23 1.add self_registration attr 2.update docs 2016-10-31 13:46:00 +08:00
Tan Jiang 004ed536cb migration-tool rework 2016-10-27 15:01:46 +08:00
Wenkai Yin 8af0bd6d38 ova installation scripts 2016-10-27 11:56:09 +08:00
yhua 311cf8da07 change code 20161019 2016-10-21 18:39:10 +08:00