dff269b5e4
full diff: https://2226e083fc390003ae5aa8325c3c92789afa0e7a...b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2 includes: - microsoft/hcsshim#718 wclayer: Work around Windows bug when expanding sandbox size - fixes microsoft/hcsshim#708 Windows Host Compute Service bug breaks docker (and other) sandboxes bigger than 20G on Windows 1903 - fixes microsoft/hcsshim#624The hcsshim on Windows 10 1903 always fails to build Docker image - fixes/addresses docker/for-win#3884 An error occurred while attempting to build Docker image (especially this comment and the next comments after: https://github.com/docker/for-win/issues/3884#issuecomment-498939672) - fixes/addresses docker/for-win#4100 Windows 1903 fails when storage-opt used - fixes moby/moby#36831 hcsshim::PrepareLayer failed in Win32: The parameter is incorrect (https://github.com/moby/moby/issues/36831#issuecomment-498612392) - fixes Stannieman/audacity-with-asio-builder#5 Docker won't build container - fixes MicrosoftDocs/visualstudio-docs#3523 Error when running build with storage-opts set - fixes moby/moby#39524 Docker build windows 19.03 --storage-opt size>20G Note that this is a temporary workaround for a bug in the platform, and will be reverted once that is addressed: - microsoft/hcsshim#721 Revert 718 when Windows 19H1 has expand sandbox fix Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
97 lines
1.8 KiB
Go
97 lines
1.8 KiB
Go
package wclayer
|
|
|
|
// This file contains utility functions to support storage (graph) related
|
|
// functionality.
|
|
|
|
import (
|
|
"syscall"
|
|
|
|
"github.com/Microsoft/go-winio/pkg/guid"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
/* To pass into syscall, we need a struct matching the following:
|
|
enum GraphDriverType
|
|
{
|
|
DiffDriver,
|
|
FilterDriver
|
|
};
|
|
|
|
struct DriverInfo {
|
|
GraphDriverType Flavour;
|
|
LPCWSTR HomeDir;
|
|
};
|
|
*/
|
|
|
|
type driverInfo struct {
|
|
Flavour int
|
|
HomeDirp *uint16
|
|
}
|
|
|
|
var (
|
|
utf16EmptyString uint16
|
|
stdDriverInfo = driverInfo{1, &utf16EmptyString}
|
|
)
|
|
|
|
/* To pass into syscall, we need a struct matching the following:
|
|
typedef struct _WC_LAYER_DESCRIPTOR {
|
|
|
|
//
|
|
// The ID of the layer
|
|
//
|
|
|
|
GUID LayerId;
|
|
|
|
//
|
|
// Additional flags
|
|
//
|
|
|
|
union {
|
|
struct {
|
|
ULONG Reserved : 31;
|
|
ULONG Dirty : 1; // Created from sandbox as a result of snapshot
|
|
};
|
|
ULONG Value;
|
|
} Flags;
|
|
|
|
//
|
|
// Path to the layer root directory, null-terminated
|
|
//
|
|
|
|
PCWSTR Path;
|
|
|
|
} WC_LAYER_DESCRIPTOR, *PWC_LAYER_DESCRIPTOR;
|
|
*/
|
|
type WC_LAYER_DESCRIPTOR struct {
|
|
LayerId guid.GUID
|
|
Flags uint32
|
|
Pathp *uint16
|
|
}
|
|
|
|
func layerPathsToDescriptors(parentLayerPaths []string) ([]WC_LAYER_DESCRIPTOR, error) {
|
|
// Array of descriptors that gets constructed.
|
|
var layers []WC_LAYER_DESCRIPTOR
|
|
|
|
for i := 0; i < len(parentLayerPaths); i++ {
|
|
g, err := LayerID(parentLayerPaths[i])
|
|
if err != nil {
|
|
logrus.WithError(err).Debug("Failed to convert name to guid")
|
|
return nil, err
|
|
}
|
|
|
|
p, err := syscall.UTF16PtrFromString(parentLayerPaths[i])
|
|
if err != nil {
|
|
logrus.WithError(err).Debug("Failed conversion of parentLayerPath to pointer")
|
|
return nil, err
|
|
}
|
|
|
|
layers = append(layers, WC_LAYER_DESCRIPTOR{
|
|
LayerId: g,
|
|
Flags: 0,
|
|
Pathp: p,
|
|
})
|
|
}
|
|
|
|
return layers, nil
|
|
}
|