00a55a319d
Fix windows
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: cb8283a6e95f33a93fab0044ca4306cf468faf8c
Component: engine
2017-12-06 23:23:55 +01:00
9a9cb24385
Remove version file
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1e1ad008db1af4f415b9ef9b8d6d225a09ab42e1
Component: engine
2017-11-01 16:25:03 -04:00
5380c10ac4
Pin docker-cli version to the 17.06-ce release version
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cef786f787dcfd87a50c7d0b7183724ab1242ed8
Component: engine
2017-08-22 14:29:16 -04:00
48f5d911ea
Fix exclude list in make.ps1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e593b72cc9d8a2fd9c7cd98b82ed468dfe3577e2
Component: engine
2017-08-09 11:03:20 -04:00
643654c2f0
Spelling fixes
...
* additional
* ambiguous
* anonymous
* anything
* application
* because
* before
* building
* capabilities
* circumstances
* commit
* committer
* compresses
* concatenated
* config
* container
* container's
* current
* definition
* delimiter
* disassociates
* discovery
* distributed
* doesnotexist
* downloads
* duplicates
* either
* enhancing
* enumerate
* escapable
* exactly
* expect
* expectations
* expected
* explicitly
* false
* filesystem
* following
* forbidden
* git with
* healthcheck
* ignore
* independent
* inheritance
* investigating
* irrelevant
* it
* logging
* looking
* membership
* mimic
* minimum
* modify
* mountpoint
* multiline
* notifier
* outputting
* outside
* overridden
* override
* parsable
* plugins
* precedence
* propagation
* provided
* provides
* registries
* repositories
* returning
* settings
* should
* signals
* someone
* something
* specifically
* successfully
* synchronize
* they've
* thinking
* uninitialized
* unintentionally
* unmarshaling
* unnamed
* unreferenced
* verify
Signed-off-by: Josh Soref <jsoref@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 39bcaee47b8a284a46b761afe218ba7deda0d482
Component: engine
2017-07-03 13:13:09 -07:00
6dc61813df
Remove bindata
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 96e61f3173c21a94f06db2bf1f8a6041da3e4e21
Component: engine
2017-06-21 11:20:05 -04:00
f9cc3f77d5
Merge pull request #33235 from Microsoft/jjh/tweakmakeps1
...
make.ps1 default to just building daemon
Upstream-commit: ef07964ab7648956acac232d8e4544e2e2ff021f
Component: engine
2017-05-17 16:24:23 +02:00
a54da24167
make.ps1 default to just building daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0a9c79f93ba3a459cc03b27f8d5114c9049d666b
Component: engine
2017-05-16 13:39:16 -07:00
58d623b06c
Ensure the correct Windows client is built
...
This script builds the client by cloning the repository to a temporary
location and building from there by temporarily changing GOPATH.
However, it was previously building by package name, and a package with
the same name in GOROOT overrides. This update changes the current
directory, and builds from there, instead of specifying a package name.
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: eab0f58661640d4309765755944dc26871f7bb59
Component: engine
2017-05-16 12:13:28 -07:00
37a6b2b6e0
Fix make.ps1 client build for Windows
...
Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 632a8635a0fa0b09759f87fc8a024d99a984c9df
Component: engine
2017-05-15 12:38:10 -07:00
2ec10e1c37
Build client on Windows in a temporary directory
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 32d47be2633bab3c606213ac44a4666aa616c64a
Component: engine
2017-05-10 11:45:10 -07:00
d8ca5cea6c
Update make.ps1 to respect client repo
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 2bc6fffacbec76a49d2e43ddf06e9f80c4651e8d
Component: engine
2017-05-09 13:07:09 -07:00
a8b3ac7249
Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope
...
Starting with this commit, integration tests should no longer rely on
the docker cli, they should be API tests instead. For the existing tests
the scripts will use a frozen version of the docker cli with a
DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains
green at all times.
To help contributors develop and test manually with a modified docker
cli, this commit also adds a DOCKER_CLI_PATH environment variable to the
Makefile. This allows to set the path of a custom cli that will be
available inside the development container and used to run the
integration tests.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 32915b1d0a315598edb737785d0357b5a1b8aa11
Component: engine
2017-05-05 12:14:29 -07:00
b3ec6dace6
Switch to new versioning scheme
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 47396d637781ef131fc47995756efff65ca1ccac
Component: engine
2017-02-15 23:22:50 -08:00
047d70f9ee
Windows: make.ps1 emit commit ID
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f48f1ff34c72c97bb000dbf235d9d6c4173384e1
Component: engine
2017-02-09 20:01:23 -08:00
edcb479225
Merge pull request #30639 from Microsoft/jjh/makeshortcut
...
Windows: Make.ps1 default to build binaries
Upstream-commit: 0a51ad2586a68ed7fd7e3547594630f07d8c9ee3
Component: engine
2017-02-07 07:39:33 -08:00
ba62bc02bb
Merge pull request #30290 from vdemeester/carry-pr-27834
...
Carry #27834 — Do not require `.git` in the build context
Upstream-commit: 4af2555a353a8f407c49adb57877ead436af04be
Component: engine
2017-02-04 19:19:16 -08:00
a336fcff25
Merge pull request #30644 from Microsoft/jjh/makecheckgoversion
...
Windows: make.ps1 validate go version
Upstream-commit: 12b8432413de26e91af78f664a2f811ab095f174
Component: engine
2017-02-02 11:39:56 -08:00
2218a3a30e
Merge pull request #29896 from Microsoft/jjh/gofmt
...
Windows: gofmt checker fixes
Upstream-commit: 8ed8366efd86273561876e0d1c540637b571aacc
Component: engine
2017-02-02 12:12:57 +01:00
c9bd261258
Windows: gofmt check write out right filename
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a08e1304d4f2a0306e266825759cb78f9ba13e68
Component: engine
2017-02-01 19:13:33 -08:00
520f42e4b0
Windows: make.ps1 validate go version
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5e7a9e523ff057f856d8a1ceb9feb7cabac6218e
Component: engine
2017-02-01 10:31:27 -08:00
12f7753d36
Windows: Make.ps1 default to build binaries
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 674247f5f02172988ba3a75f04e97baaac348aaa
Component: engine
2017-02-01 09:54:04 -08:00
77aff38fae
Windows updates for .git in .dockerignore
...
Signed-off-by: John Howard jhoward@microsoft.com
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f32b267d1c09b0cc330bf42c8859a0eb00faf8b9
Component: engine
2017-01-24 14:43:02 +01:00
f421a18923
Merge pull request #29147 from Microsoft/jjh/makeroot
...
Windows: make.ps1 calc root
Upstream-commit: ba4f8f06b3cab866c58945a9b7a7f3735c855b32
Component: engine
2017-01-20 15:01:58 +01:00
377b3251ff
Fix some typos
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 827bbe90a0fc53342a85d2653d96b8ba55658adf
Component: engine
2017-01-19 15:29:28 +08:00
55c8f05f0d
Add validation for compose schema bindata.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 38d08b0bd1a8aa931cefd9caf837dbc9a4bb0a37
Component: engine
2016-12-28 14:45:44 -05:00
9e120272c4
Fix regular expression for PowerShell DCO check
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 0ce6c12f88b556cf1eabd2f809c2b23cbea229c7
Component: engine
2016-12-20 15:32:39 -08:00
42f938d12c
fix powershell dco check
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 611a633ba4e11215a23d8b405a537346b10d9657
Component: engine
2016-12-16 23:48:27 +01:00
14c40e7945
Windows: make.ps1 fix DCO check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e538c1fdca16cadf59f1d19df75857c8b2c4af06
Component: engine
2016-12-07 17:58:07 -08:00
8290729448
Merge pull request #29145 from Microsoft/jjh/make
...
Windows: make.ps1 Throw exception on failure
Upstream-commit: 080d7a554322076c4347b3d3f203289eb949cc74
Component: engine
2016-12-06 12:10:56 +01:00
f9e126f19d
remove bonus whitespace
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 8d47858f96c7ef03a9d3543e0994119390acb1bb
Component: engine
2016-12-05 20:21:25 -08:00
cd8cef8c09
Windows: make.ps1 calc root
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8c93a41044b90834b8d3fcdb50ed3619ba3cbf71
Component: engine
2016-12-05 13:26:04 -08:00
7c4ac2a285
Windows: make.ps1 Throw exception on failure
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8c22a00b77043db50a1b4837a66dfb27dab3f070
Component: engine
2016-12-05 09:58:56 -08:00
05a05baa0e
Windows: make.ps1 and Dockerfile for native builds
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 155435b6ceeb05b2927ecc726216666b898b6459
Component: engine
2016-12-02 10:46:15 -08:00
