Browse code

Windows: Dockerfile 2GB clarification Hyper-V

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2016/12/06 07:01:17
Showing 1 changed files
... ...
@@ -62,14 +62,17 @@
62 62
 #    >>   cd C:\go\src\github.com\docker\docker 
63 63
 #
64 64
 #
65
-# 3. Build a docker image with the components required to build the docker binaries from source:
65
+# 3. Build a docker image with the components required to build the docker binaries from source
66
+#    by running one of the following:
66 67
 #
67
-#    >>   docker build -t nativebuildimage -f Dockerfile.windows .
68
+#    >>   docker build -t nativebuildimage -f Dockerfile.windows .          
69
+#    >>   docker build -t nativebuildimage -f Dockerfile.windows -m 2GB .    (if using Hyper-V containers)
68 70
 #
69 71
 #
70
-# 4. Build the docker executable binaries:
72
+# 4. Build the docker executable binaries by running one of the following:
71 73
 #
72 74
 #    >>   docker run --name binaries nativebuildimage hack\make.ps1 -Binary
75
+#    >>   docker run --name binaries -m 2GB nativebuildimage hack\make.ps1 -Binary    (if using Hyper-V containers)
73 76
 #
74 77
 #
75 78
 # 5. Copy the binaries out of the container, replacing HostPath with an appropriate destination 
... ...
@@ -96,10 +99,11 @@
96 96
 
97 97
 
98 98
 #  The validation tests can either run in a container, or directly on the host. To run in a
99
-#  container, ensure you have created the nativebuildimage above. Then run the following
100
-#  from an (elevated) Windows PowerShell prompt:
99
+#  container, ensure you have created the nativebuildimage above. Then run one of the
100
+#  following from an (elevated) Windows PowerShell prompt:
101 101
 #
102 102
 #    >>   docker run --rm nativebuildimage hack\make.ps1 -DCO -PkgImports -GoFormat
103
+#    >>   docker run --rm -m 2GB nativebuildimage hack\make.ps1 -DCO -PkgImports -GoFormat    (if using Hyper-V containers)
103 104
 
104 105
 # To run the validation tests on the host, from the root of the repository, run the
105 106
 # following from a Windows PowerShell prompt (elevation is not required): (Note Go
... ...
@@ -110,20 +114,21 @@
110 110
 # -----------------------------------------------------------------------------------------
111 111
 
112 112
 
113
-#  To run unit tests, ensure you have created the nativebuildimage above. Then run the
114
-#  following from an (elevated) Windows PowerShell prompt:
113
+#  To run unit tests, ensure you have created the nativebuildimage above. Then run one of
114
+#  the following from an (elevated) Windows PowerShell prompt:
115 115
 #
116 116
 #    >>   docker run --rm nativebuildimage hack\make.ps1 -TestUnit
117
+#    >>   docker run --rm -m 2GB nativebuildimage hack\make.ps1 -TestUnit    (if using Hyper-V containers)
117 118
 
118 119
 
119 120
 # -----------------------------------------------------------------------------------------
120 121
 
121 122
 
122 123
 #  To run all tests and binary build, ensure you have created the nativebuildimage above. Then 
123
-# run the following from an (elevated) Windows PowerShell prompt:
124
+#  run one of the following from an (elevated) Windows PowerShell prompt:
124 125
 #
125 126
 #    >>   docker run nativebuildimage hack\make.ps1 -All
126
-
127
+#    >>   docker run -m 2GB nativebuildimage hack\make.ps1 -All    (if using Hyper-V containers)
127 128
 
128 129
 # -----------------------------------------------------------------------------------------
129 130