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

debugging stuffz

This commit is contained in:
Nathan McCauley 2015-04-28 10:28:40 -07:00
parent 5938d9e09c
commit 95adc15e36
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -4,6 +4,6 @@ COPY . /go/src/github.com/docker/vetinari
RUN GOPATH=/go/:/go/src/github.com/docker/vetinari/Godeps/_workspace go install github.com/docker/vetinari/cmd/vetinari-server RUN GOPATH=/go/:/go/src/github.com/docker/vetinari/Godeps/_workspace go install github.com/docker/vetinari/cmd/vetinari-server
EXPOSE 4443 EXPOSE 4444
CMD vetinari-server -config /go/src/github.com/docker/vetinari/cmd/vetinari-server/dev-config.json CMD vetinari-server -config /go/src/github.com/docker/vetinari/cmd/vetinari-server/dev-config.json

2
cmd/vetinari-server/dev-config.json
View File

@ -1,6 +1,6 @@
{ {
"server": { "server": {
"addr": ":4443", "addr": ":4444",
"tls_cert_file": "../../fixtures/vetinari.key", "tls_cert_file": "../../fixtures/vetinari.key",
"tls_key_file": "../../fixtures/vetinari.pem", "tls_key_file": "../../fixtures/vetinari.pem",
"tls_ca_file": "/go/src/github.com/docker/vetinari/fixtures/ca.cert" "tls_ca_file": "/go/src/github.com/docker/vetinari/fixtures/ca.cert"

2
docker-compose.yml
View File

@ -4,7 +4,7 @@ vetinari:
- rufus - rufus
ports: ports:
- "8080:8080" - "8080:8080"
- "127.0.0.1:4443:4443" - "4444:4444"
rufus: rufus:
build: ../rufus build: ../rufus
ports: ports:

3
server/rufus_trust.go
View File

@ -28,8 +28,11 @@ func newRufusSigner(hostname string, port string, tlscafile string) *RufusSigner
if err != nil { if err != nil {
log.Fatalf("fail to read: %v", err) log.Fatalf("fail to read: %v", err)
} }
log.Println("before dial")
opts = append(opts, grpc.WithTransportCredentials(creds)) opts = append(opts, grpc.WithTransportCredentials(creds))
log.Println("after dial")
conn, err := grpc.Dial(netAddr, opts...) conn, err := grpc.Dial(netAddr, opts...)
log.Println("finished dial")
if err != nil { if err != nil {
log.Fatalf("fail to dial: %v", err) log.Fatalf("fail to dial: %v", err)
} }

7
server/server.go
View File

@ -25,6 +25,7 @@ func Run(ctx context.Context, conf *config.Configuration) error {
if conf.TrustService.Type == "remote" { if conf.TrustService.Type == "remote" {
log.Println("[Vetinari Server] : Using remote signing service") log.Println("[Vetinari Server] : Using remote signing service")
trust = newRufusSigner(conf.TrustService.Hostname, conf.TrustService.Port, conf.Server.TLSCAFile) trust = newRufusSigner(conf.TrustService.Hostname, conf.TrustService.Port, conf.Server.TLSCAFile)
log.Println("return from RufusSigner")
} else { } else {
log.Println("[Vetinari Server] : Using local signing service") log.Println("[Vetinari Server] : Using local signing service")
trust = signed.NewEd25519() trust = signed.NewEd25519()
@ -34,6 +35,7 @@ func Run(ctx context.Context, conf *config.Configuration) error {
if err != nil { if err != nil {
return err return err
} }
log.Println("loaded x509")
tlsConfig := &tls.Config{ tlsConfig := &tls.Config{
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
@ -52,14 +54,17 @@ func Run(ctx context.Context, conf *config.Configuration) error {
Rand: rand.Reader, Rand: rand.Reader,
} }
log.Println("resolving tcpaddr")
tcpAddr, err := net.ResolveTCPAddr("tcp", conf.Server.Addr) tcpAddr, err := net.ResolveTCPAddr("tcp", conf.Server.Addr)
if err != nil { if err != nil {
return err return err
} }
log.Println("setup listen tcp")
lsnr, err := net.ListenTCP("tcp", tcpAddr) lsnr, err := net.ListenTCP("tcp", tcpAddr)
if err != nil { if err != nil {
return err return err
} }
log.Println("new listener")
tlsLsnr := tls.NewListener(lsnr, tlsConfig) tlsLsnr := tls.NewListener(lsnr, tlsConfig)
// This is a basic way to shutdown the running listeners. // This is a basic way to shutdown the running listeners.
@ -74,6 +79,7 @@ func Run(ctx context.Context, conf *config.Configuration) error {
}() }()
log.Println("roothandlerfactory")
hand := utils.RootHandlerFactory(&utils.InsecureAuthorizer{}, utils.NewContext, trust) hand := utils.RootHandlerFactory(&utils.InsecureAuthorizer{}, utils.NewContext, trust)
r := mux.NewRouter() r := mux.NewRouter()
@ -83,6 +89,7 @@ func Run(ctx context.Context, conf *config.Configuration) error {
r.Methods("DELETE").Path("/{imageName}:{tag}").Handler(hand(handlers.RemoveHandler, utils.SSDelete)) r.Methods("DELETE").Path("/{imageName}:{tag}").Handler(hand(handlers.RemoveHandler, utils.SSDelete))
r.Methods("POST").Path("/{imageName}:{tag}").Handler(hand(handlers.AddHandler, utils.SSUpdate)) r.Methods("POST").Path("/{imageName}:{tag}").Handler(hand(handlers.AddHandler, utils.SSUpdate))
log.Println("server")
server := http.Server{ server := http.Server{
Addr: conf.Server.Addr, Addr: conf.Server.Addr,
Handler: r, Handler: r,