Commit Graph

868 Commits

Author SHA1 Message Date
zhongyehong b40fad7acc Add a parameter to control whether the add node function is enabled. 2018-05-20 17:32:35 +08:00
zhongyehong 490a9901ac allow root change the cloud setting in cloud pannel 2018-05-20 17:16:56 +08:00
zhongyehong 37c9b13e28 Merge remote-tracking branch 'upstream/master' 2018-05-20 16:08:00 +08:00
zhongyehong d3750eb7f8 Implement addnode function on aliyun cloud 2018-05-20 16:05:11 +08:00
zhong yehong 2c2f318b64
Merge pull request #296 from zhongyehong/batch
add frame for batch
2018-05-13 15:29:20 +08:00
zhongyehong 44a68ae51a add frame for batch 2018-05-13 15:26:05 +08:00
zhongyehong 2ca69b8e47 adding scale module 2018-05-13 13:21:17 +08:00
Yujian Zhu 16cfef3219
Merge pull request #295 from FirmlyReality/file2db
File2db
2018-04-22 16:03:55 +08:00
zhuyj17 03df782f62 Merge branch 'master' of https://github.com/unias/docklet into file2db 2018-04-22 15:59:09 +08:00
zhuyj17 3e999e4511 1.Fix bugs on upgrade script. 2. Can't add port mappings when cluster is stopped. 2018-04-22 15:58:41 +08:00
zhuyj17 5d8abf2d44 Add a python script to upgrade 2018-04-22 15:21:19 +08:00
zhong yehong b82498eae9
Merge pull request #294 from zhongyehong/master
Modified recovery mode
2018-04-22 14:47:26 +08:00
zhongyehong 984819686e fix a bug caused by merge 2018-04-22 14:45:04 +08:00
zhongyehong 867ee221b6 fix a bug of displaying copy button 2018-04-22 14:23:32 +08:00
zhongyehong d5bc0e583d Merge remote-tracking branch 'upstream/master' 2018-04-22 14:06:43 +08:00
zhongyehong 39fcf8a26f Modified recovery mode 2018-04-22 14:03:41 +08:00
zhuyj17 0cbb288175 Add BillingHistory model and fix a bug when use db to bill 2018-04-22 12:39:54 +08:00
Yujian Zhu 7ba93cfa65
Merge pull request #293 from FirmlyReality/file2db
Use database when operating on clusters, containers, ports mappings and images.
2018-04-15 23:50:58 +08:00
zhuyj17 d959b6f23e Update copy image to use db 2018-04-15 22:52:00 +08:00
zhuyj17 c152d8650a Fix conlicts 2018-04-14 00:25:05 +08:00
zhuyj17 831014f7f5 Fix some bugs in imagemgr 2018-04-14 00:17:38 +08:00
Firmlyzhu 1f7598b27b Fix some bugs on imagemgr 2018-04-13 16:39:36 +08:00
Firmlyzhu 5a2facc028 Fix a bug 2018-04-13 16:02:01 +08:00
Firmlyzhu 3f54ff3952 Use db in imagemgr 2018-04-13 15:50:49 +08:00
zhuyj17 6870d16bc3 Use db when update proxyurl 2018-04-08 23:09:28 +08:00
zhuyj17 1f756540f8 Use db when managing port mappings 2018-04-08 22:56:15 +08:00
zhuyj17 05970254a0 Use db when start and stop clusters 2018-04-08 17:02:09 +08:00
zhuyj17 06dfd80363 Use database when create,delete,scale_in,scale_out clusters 2018-04-08 16:55:57 +08:00
zhong yehong 04d1a92c36
Merge pull request #292 from zhongyehong/master
image copy
2018-04-08 15:16:08 +08:00
zhongyehong 9dc3f346ac Merge remote-tracking branch 'upstream/master' 2018-04-08 15:12:21 +08:00
zhongyehong 640b6cda52 Optimizing the display of image information for cmd tool 2018-04-08 15:10:18 +08:00
zhongyehong d9cc0c2c9f user can copy an image to other masters 2018-04-08 15:05:04 +08:00
zhuyj17 d9dd9de94d add flask-migrate 2018-03-19 09:27:21 +08:00
zhuyj17 6b3c83cebb Add 3 new models: Container, PortMapping and VCluster 2018-03-11 16:29:54 +08:00
Yujian Zhu dc97b71550
Merge pull request #291 from FirmlyReality/image_lock
Add users' locks to when operating on images.
2018-03-11 14:28:06 +08:00
zhuyj17 e9b8669fc9 Add users' locks to when operating on images. 2018-03-11 11:21:36 +08:00
Yujian Zhu 0b81a6f24d
Merge pull request #290 from FirmlyReality/user_threading
Add locks to user.py to solve synchronization problems.
2018-03-04 16:32:06 +08:00
zhuyj17 aa63f18b95 Add locks to user.py to solve synchronization problems. 2018-03-04 15:20:46 +08:00
CuiZhicheng 0e0cd8110b
Merge pull request #289 from CuiZhicheng/master
fix a type error in web/web.py
2018-03-01 15:16:48 +08:00
CuiZhicheng 730a6888b8 fix a type error in web/web.py 2018-03-01 15:14:53 +08:00
Yujian Zhu d848afc523
Merge pull request #288 from FirmlyReality/master
add users' locks to port_mapping
2018-01-21 22:59:01 +08:00
zhuyj17 63d5f01d8c add users' locks to port_mapping 2018-01-21 22:57:29 +08:00
Yujian Zhu 5877440f3a
Merge pull request #287 from FirmlyReality/threading
Threading
2018-01-21 18:46:27 +08:00
Firmlyzhu b768de1345 fix a bug that it will display wrong messages when scale in the clusters. 2018-01-21 18:43:01 +08:00
Firmlyzhu 113218b2c0 add locks to operations of clusters and acquiring ids and acquiring ip addresses and port mappings 2018-01-21 18:36:42 +08:00
Yujian Zhu dfa1512296
Merge pull request #285 from FirmlyReality/master
Fix a bug of port control & a bug of update_v0.3.2.py
2018-01-07 14:23:51 +08:00
zhuyj17 61ff425f04 Fix a bug of port control & a bug of update_v0.3.2.py 2018-01-07 14:22:25 +08:00
zhong yehong bb3412014f
Merge pull request #284 from zhongyehong/master
fix a bug of update base image
2018-01-06 14:20:07 +08:00
zhongyehong 52d1e8fb82 fix a bug of update base image
prepare base image in prepare.sh
add a packagefs layer
2018-01-06 14:05:12 +08:00
Yujian Zhu 7e64c90d4f
Update CHANGES 2017-12-11 15:37:25 +08:00