mirror of https://github.com/goharbor/harbor.git
refine
This commit is contained in:
parent
9d103d3b09
commit
dae7881088
|
@ -15,12 +15,10 @@ http {
|
|||
|
||||
upstream registry {
|
||||
server registry:5000;
|
||||
# check interval=2000 rise=1 fall=1 timeout=5000 type=tcp;
|
||||
}
|
||||
|
||||
upstream ui {
|
||||
server ui:80;
|
||||
# check interval=2000 rise=1 fall=1 timeout=5000 type=tcp;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -39,8 +39,8 @@ ui:
|
|||
- ./config/ui/app.conf:/etc/ui/app.conf
|
||||
- ./config/ui/private_key.pem:/etc/ui/private_key.pem
|
||||
links:
|
||||
- registry:registry
|
||||
- mysql:mysql
|
||||
- registry
|
||||
- mysql
|
||||
- log
|
||||
log_driver: "syslog"
|
||||
log_opt:
|
||||
|
@ -51,8 +51,8 @@ proxy:
|
|||
volumes:
|
||||
- ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
|
||||
links:
|
||||
- ui:ui
|
||||
- registry:registry
|
||||
- ui
|
||||
- registry
|
||||
- log
|
||||
ports:
|
||||
- 80:80
|
||||
|
|
10
dao/base.go
10
dao/base.go
|
@ -50,12 +50,12 @@ func isContainIllegalChar(s string, illegalChar []string) bool {
|
|||
|
||||
func GenerateRandomString() (string, error) {
|
||||
o := orm.NewOrm()
|
||||
var salt string
|
||||
err := o.Raw(`select uuid() as uuid`).QueryRow(&salt)
|
||||
var uuid string
|
||||
err := o.Raw(`select uuid() as uuid`).QueryRow(&uuid)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return salt, nil
|
||||
return uuid, nil
|
||||
|
||||
}
|
||||
|
||||
|
@ -112,8 +112,8 @@ func init() {
|
|||
}()
|
||||
select {
|
||||
case <-ch:
|
||||
case <-time.After(30 * time.Second):
|
||||
panic("Failed to connect to DB after 30 seconds")
|
||||
case <-time.After(60 * time.Second):
|
||||
panic("Failed to connect to DB after 60 seconds")
|
||||
}
|
||||
orm.RegisterDataBase("default", "mysql", db_str)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue