docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

couple of fixes for demo

This commit is contained in:
David Lawrence 2015-04-28 13:47:38 -07:00
parent 9e11a590c2
commit b858e939a3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/handlers/default.go
View File

@ -63,7 +63,7 @@ func AddHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *erro
Err: err, Err: err,
} }
} }
_ = tufRepo.Init(true) _ = tufRepo.Init(false)
err = tufRepo.AddTarget(vars["tag"], json.RawMessage{}) err = tufRepo.AddTarget(vars["tag"], json.RawMessage{})
if err != nil { if err != nil {
return &errors.HTTPError{ return &errors.HTTPError{
@ -116,7 +116,7 @@ func RemoveHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *e
Err: err, Err: err,
} }
} }
_ = tufRepo.Init(true) _ = tufRepo.Init(false)
tufRepo.RemoveTarget(vars["tag"]) tufRepo.RemoveTarget(vars["tag"])
err = tufRepo.Sign("targets.json") err = tufRepo.Sign("targets.json")
if err != nil { if err != nil {

8
server/server.go
View File

@ -84,10 +84,10 @@ func Run(ctx context.Context, conf *config.Configuration) error {
r := mux.NewRouter() r := mux.NewRouter()
// TODO (endophage): use correct regexes for image and tag names // TODO (endophage): use correct regexes for image and tag names
r.Methods("PUT").Path("/{imageName}/init").Handler(hand(handlers.GenKeysHandler, utils.SSCreate)) r.Methods("PUT").Path("/{imageName:.*}/init").Handler(hand(handlers.GenKeysHandler, utils.SSCreate))
r.Methods("GET").Path("/{imageName}/{tufFile}").Handler(hand(handlers.GetHandler, utils.SSNoAuth)) r.Methods("GET").Path("/{imageName:.*}/{tufFile:(root.json|targets.json|timestamp.json|snapshot.json)}").Handler(hand(handlers.GetHandler, utils.SSNoAuth))
r.Methods("DELETE").Path("/{imageName}:{tag}").Handler(hand(handlers.RemoveHandler, utils.SSDelete)) r.Methods("DELETE").Path("/{imageName:.*}/{tag:[a-zA-Z0-9]+}").Handler(hand(handlers.RemoveHandler, utils.SSDelete))
r.Methods("POST").Path("/{imageName}:{tag}").Handler(hand(handlers.AddHandler, utils.SSUpdate)) r.Methods("POST").Path("/{imageName:.*}/{tag:[a-zA-Z0-9]+}").Handler(hand(handlers.AddHandler, utils.SSUpdate))
log.Println("server") log.Println("server")
server := http.Server{ server := http.Server{