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

Windows: Daemon build is broken 

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-07-29 20:08:51 -07:00
parent 4c7cf30260
commit b43dc0d93c
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/server/server_windows.go
View File

@ -19,7 +19,7 @@ func (s *Server) newServer(proto, addr string) ([]serverCloser, error) {
) )
switch proto { switch proto {
case "tcp": case "tcp":
l, err := s.initTcpSocket(addr) l, err := s.initTCPSocket(addr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -31,7 +31,7 @@ func (s *Server) newServer(proto, addr string) ([]serverCloser, error) {
var res []serverCloser var res []serverCloser
for _, l := range ls { for _, l := range ls {
res = append(res, &HttpServer{ res = append(res, &HTTPServer{
&http.Server{ &http.Server{
Addr: addr, Addr: addr,
Handler: s.router, Handler: s.router,

32
pkg/chrootarchive/diff_windows.go
View File

@ -9,23 +9,43 @@ import (
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
) )
// ApplyLayer parses a diff in the standard layer format from `layer`,
// and applies it to the directory `dest`. The stream `layer` can only be
// uncompressed.
// Returns the size in bytes of the contents of the layer.
func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) {
return applyLayerHandler(dest, layer, true)
}
// ApplyUncompressedLayer parses a diff in the standard layer format from
// `layer`, and applies it to the directory `dest`. The stream `layer`
// can only be uncompressed.
// Returns the size in bytes of the contents of the layer.
func ApplyUncompressedLayer(dest string, layer archive.ArchiveReader) (int64, error) {
return applyLayerHandler(dest, layer, false)
}
// ApplyLayer parses a diff in the standard layer format from `layer`, and // ApplyLayer parses a diff in the standard layer format from `layer`, and
// applies it to the directory `dest`. Returns the size in bytes of the // applies it to the directory `dest`. Returns the size in bytes of the
// contents of the layer. // contents of the layer.
func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) { func applyLayerHandler(dest string, layer archive.ArchiveReader, decompress bool) (size int64, err error) {
dest = filepath.Clean(dest) dest = filepath.Clean(dest)
decompressed, err := archive.DecompressStream(layer) if decompress {
if err != nil { decompressed, err := archive.DecompressStream(layer)
return 0, err if err != nil {
return 0, err
}
defer decompressed.Close()
layer = decompressed
} }
defer decompressed.Close()
tmpDir, err := ioutil.TempDir(os.Getenv("temp"), "temp-docker-extract") tmpDir, err := ioutil.TempDir(os.Getenv("temp"), "temp-docker-extract")
if err != nil { if err != nil {
return 0, fmt.Errorf("ApplyLayer failed to create temp-docker-extract under %s. %s", dest, err) return 0, fmt.Errorf("ApplyLayer failed to create temp-docker-extract under %s. %s", dest, err)
} }
s, err := archive.UnpackLayer(dest, decompressed) s, err := archive.UnpackLayer(dest, layer)
os.RemoveAll(tmpDir) os.RemoveAll(tmpDir)
if err != nil { if err != nil {
return 0, fmt.Errorf("ApplyLayer %s failed UnpackLayer to %s", err, dest) return 0, fmt.Errorf("ApplyLayer %s failed UnpackLayer to %s", err, dest)