starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-02 18:14:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,229 Commits 14 Branches 321 Tags
2f34129ae0917781fcb41a358c4afbd380e511fa
Commit Graph
508 Commits
Author SHA1 Message Date
Vincent DemeesterandGitHub 5c99e2a951 Merge pull request #27805 from Microsoft/jjh/fixbuildercache 
Windows: Fix builder cache bug
Upstream-commit: 9e206b551288c5197a2523ad0f887341972d75c8
Component: engine
 2016-10-28 02:49:40 +02:00
John Howard 6ef00270be Windows: Fix builder cache bug 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4f3889e4be9fe518e9be73306a8716c3a5f4b1c6
Component: engine
 2016-10-27 12:27:30 -07:00
Sebastiaan van StijnandGitHub b63aa05761 Merge pull request #27702 from tonistiigi/net-builder0 
add --network option for docker build
Upstream-commit: 62ff3e90835c3c572051afbbbac53303e57a5c89
Component: engine
 2016-10-25 21:50:33 -07:00
sandyskiesandTonis Tiigi 29210e7b5b add --network option for docker build 
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 60813af7aeea819ca228b6b1d6f4888969b95da3
Component: engine
 2016-10-25 10:25:36 -07:00
John Howard adbaf3869a Windows: Honour escape directive fully 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 912781841422363219e064a1df6df39dabf4cd81
Component: engine
 2016-10-21 14:22:14 -07:00
Stephen J Day fe1dce6a91 pkg/archive: remove unnecessary Archive and Reader type 
The `archive` package defines aliases for `io.ReadCloser` and
`io.Reader`. These don't seem to provide an benefit other than type
decoration. Per this change, several unnecessary type cases were
removed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: aa2cc18745cbe0231c33782f0fa764f657e3fb88
Component: engine
 2016-10-20 19:31:24 -07:00
Alexander MorozovandGitHub 21157ba472 Merge pull request #27436 from YuPengZTE/devFirst 
The first letter should be small in error of remote.go
Upstream-commit: 462cb3855dcb3bf14214c23a9271ceb63b97ea67
Component: engine
 2016-10-18 12:49:04 -07:00
YuPengZTE 5a9599d246 The first letter should be small in error of remote.go 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 1d238181d9d7d3981ec5bdfd5236a701586cc8a9
Component: engine
 2016-10-17 15:19:10 +08:00
Sebastiaan van StijnandGitHub 086cdbe518 Merge pull request #27174 from duglin/Issue26027 
Don't env-var evaluate labels from docker build cmd line
Upstream-commit: 6f54d70a54d8d711e2b9d1e2578d45682e7130b8
Component: engine
 2016-10-14 20:57:41 -07:00
Tonis Tiigi c39b9d6194 Remove checkpoint methods from builder backend 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5fb3b4205a8b0635ff193791ef581939806eb8da
Component: engine
 2016-10-11 14:00:29 -07:00
Tibor VassandGitHub a92d57e7db Merge pull request #26719 from AkihiroSuda/fix-race-builder-vs-container-1 
Fix a race found in TestBuildCancellationKillsSleep
Upstream-commit: f5f0b77cec3d05f9f9f3ec618693030166fb1aa0
Component: engine
 2016-10-10 18:54:55 +02:00
John Howard 75a301f015 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e85867cb68cc28208c91bb43fc5cdcff824c468e
Component: engine
 2016-10-06 09:32:22 -07:00
Doug Davis 0f8abc83e4 Don't env-var evaluate labels from docker build cmd line 
Fixes #26027

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 28a9a7deb002f3c86cb59dbd02ee75435e7fe1e2
Component: engine
 2016-10-05 18:17:02 -07:00
Doug Davis 5bbd3d9214 Require continuation char to be last char in a line 
While look at #27039 I noticed that we allow for whitespace after
the continuation char (\\) which is wrong. It needs to be the very
last char in the line.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 105bc63295a7126798d3722a0e205c5ead4e2b1c
Component: engine
 2016-10-04 09:38:00 -07:00
Akihiro Suda 45ef4c7643 Fix a race found in TestBuildCancellationKillsSleep 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: ed2e79fc03cc78345675d208b3ace2c2fa688cb7
Component: engine
 2016-09-27 16:19:49 +00:00
Tõnis Tiigi cc3c0d322a Implement build cache based on history array 
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
Upstream-commit: 690882c2e79c3f3742c709cf158584e61594ba00
Component: engine
 2016-09-23 11:30:06 -07:00
Vincent DemeesterandGitHub a0b2adc110 Merge pull request #26516 from yongtang/26453-build-bad-syntax 
Check bad syntax on dockerfile before building.
Upstream-commit: 72f556a9ff1043a4188e8eeef892d8a0ba4fe34f
Component: engine
 2016-09-23 12:24:20 +02:00
allencloud 92f94b6c20 correct some nits in comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9279a93f6d43da4c904eeb0adb249fdfa34f7f92
Component: engine
 2016-09-15 12:17:58 +08:00
Darren Stahl efe814ccf6 Windows: Fix wildcard expansion after slash in filename 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 309056648c8263aca388e679179464e59a9f52c8
Component: engine
 2016-09-14 11:40:57 -07:00
Yong Tang 9a730a715e Check bad syntax on dockerfile before building. 
This fix tries to address the issue raised in 26453 where bad syntax
on dockerfile is not checked before building, thus user has to wait
before seeing error in dockerfile.

This fix fixes the issue by evaluating all the instructions and check
syntax before dockerfile is invoked actually.

All existing tests pass.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c8dc2b156a079ce03db8f579094b9643632661a8
Component: engine
 2016-09-13 21:43:10 -07:00
boucher 7bef93723c Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
 2016-09-08 21:31:52 -04:00
Michael Crosby 45ddc4bfcb Add engine-api types to docker 
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
 2016-09-07 11:05:58 -07:00
Vincent DemeesterandGitHub 637e45cd56 Merge pull request #26290 from tonistiigi/govet17 
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
 2016-09-03 19:27:19 +02:00
Tonis Tiigi 833a33ebb8 Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
 2016-09-02 19:07:54 -07:00
Thomas Leonard 22f7fc770f Fix exec form of HEALTHCHECK CMD 
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.

Added a test to detect this.

Fixes #26174

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
Upstream-commit: e95b6b51daed868094c7b66113381d5088e831b4
Component: engine
 2016-08-31 17:50:12 +01:00
allencloud 17447fd1b0 correct some nits in comment and test files 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 52637848a769b8c80d2f1e28d3d34ada6d35b5a6
Component: engine
 2016-08-29 18:37:14 +08:00
sakeven cf918862de fmt dockerfile error message 
Signed-off-by: sakeven <jc5930@sina.cn>
Upstream-commit: 7d75e42bc9d0f19f8829b65634495965f02e89a3
Component: engine
 2016-08-26 18:36:30 +08:00
Doug DavisandGitHub db8cc1fdde Merge pull request #24978 from yongtang/24912-build-with-progress 
Add hint of progress to the output of `docker build`
Upstream-commit: 282b0aff08030a2521adf7d64bdd333f0864b720
Component: engine
 2016-08-18 16:10:48 -04:00
Michael CrosbyandGitHub b496a6d286 Merge pull request #24311 from ShevYan/incorrect-comments-in-dockerfile 
Dockerfile's comments for "Run the test suite" are out of date becaus…
Upstream-commit: 2faeebc7504acd257200ce26470d3037448ae952
Component: engine
 2016-08-12 15:53:06 -07:00
Alexander MorozovandGitHub cb1c855c27 Merge pull request #23951 from allencloud/defer-os-file-close 
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
 2016-08-10 11:07:15 -07:00
allencloud 1c502571ef add defer file.Close to avoid potential fd leak 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
 2016-08-10 08:36:09 +08:00
Justin Cormack 15fecb0bf3 More helpful error message when not sufficiently argumentative 
The error message suggests you need one argument even when you
have provided one. Suggest having another argument.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 4ce93940b7c2a640c94296f20352cf6f052d1028
Component: engine
 2016-08-08 17:22:09 +01:00
Doug Davis bb00cee2aa Don't allow empty env names 
Closes: #25281

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: e72c0137af63c2f5aecce48443e3b654a3895150
Component: engine
 2016-08-01 10:25:51 -07:00
Vincent DemeesterandGitHub 1c72cebc59 Merge pull request #23969 from tkopczynski/20784-builder-dockerfile-dispatchers-2 
Builder dispatchers unit tests
Upstream-commit: 0fc062d31ea00286c49d2310e245b6bb7b4a16e1
Component: engine
 2016-07-29 07:26:48 +02:00
John HowardandMichael Crosby 16a63d94bb Move directive out of globals 
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 755be795b4e48b3eadcdf1427bf9731b0e97bed1
Component: engine
 2016-07-26 10:35:33 -07:00
Brian Goff f4ad386d76 Fix issue with test ordering for TestParseWords 
`TestParseWords` needs to use the `tokenEscape` for one of the test
cases, but `tokenEscape` was not being set unless tests ran in a
specific order.
This sets a default value for `tokenEscape`... `\`... so that tests that
rely on this global are not affected by test ordering.

This is the simplest fix for these cases. Ideally the token should not
be set as a global but rather passed down, which is a much larger
change.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: df167d3ff04cdc90012c8ca39647662ad69e6715
Component: engine
 2016-07-26 10:50:12 -04:00
Yong Tang 48c6a8f86f Add hint of progress to the output of docker build 
This fix tries to address the issue raised in 24912 where docker
build only consists of the current step without overall total steps.

This fix adds the overall total steps so that end user could follow
the progress of the docker build.

An additonal test has been added to cover the changes.

This fix fixes 24912.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 35418c145518c3f816ae5837beda7d853ce96dfc
Component: engine
 2016-07-24 08:13:58 -07:00
Tomasz Kopczynski e0f9de9c83 Builder dispatchers unit tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 9408b205f5ac4779cbcc75f42de995668d373baa
Component: engine
 2016-07-12 07:40:25 +02:00
Sebastiaan van StijnandGitHub f7a6ca3323 Merge pull request #22868 from Microsoft/jjh/dockerfilecmd 
Windows: CMD not honouring arg escaping
Upstream-commit: 6167a9ab166ce1e6fd0ffa653b9476d33983f15b
Component: engine
 2016-07-07 09:21:26 -07:00
Vincent Demeester e4dfc2d04c Validate hostname starting from 1.24 API. 
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
 2016-07-06 09:13:59 +02:00
Shev Yan dc5e6798a1 Dockerfile's comments for "Run the test suite" are out of date because there is no 'test' in hack/make directory. 
Signed-off-by: Shev Yan <yandong_8212@163.com>
Upstream-commit: 11280665b45d0ac9920d17abaf6a7328f2bc77d9
Component: engine
 2016-07-04 22:43:53 +08:00
Otto Kekäläinen 0bdbf282f3 Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
 2016-07-03 20:58:11 +03:00
danf 9de77e3319 Fix Malformed history layer - missing Sprintf in append of shell in Builder run config 
Signed-off-by: Dan Feldman <danf@jfrog.com>
Upstream-commit: 29b6a696604d5bc80d1722e3ba123558bce7c7c9
Component: engine
 2016-06-28 11:09:39 +03:00
Tomasz Kopczynski ec8d3f9fa9 Builder/dockerfile/dispatchers.go tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 5ece81a72aea6797809303aa3b68871f6ae01f6e
Component: engine
 2016-06-19 14:45:34 +02:00
John Howard 610f859f67 Windows: CMD not honouring arg escaping 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d05d0211bcf43d4519bfcbbc6029fafa122f86b7
Component: engine
 2016-06-15 16:46:32 -07:00
Vincent DemeesterandGitHub 02e6cd83ac Merge pull request #23322 from tkopczynski/20784-builder-dockerfile-symlink 
Reimplement integration test for symlink Dockerfile as a unit test
Upstream-commit: e08aed59dfd1642ae04ac4eb1055a378d6a572c1
Component: engine
 2016-06-15 10:52:49 +02:00
Tomasz Kopczynski f0593ff496 Reimplement integration test for symlink Dockerfile as a unit test 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 830584b011ebf75500f307efa5425cf63e89d713
Component: engine
 2016-06-14 23:07:19 +02:00
Vincent DemeesterandGitHub dc116784a5 Merge pull request #23093 from tkopczynski/20784-builder-dockerfile-outside-context 
Builder integration tests for Dockerfile outside context as a unit test
Upstream-commit: 7d988a7aa6ae20020f0f96c6e2a47377e3567a3d
Component: engine
 2016-06-14 08:44:24 +02:00
Tiffany Jernigan 394bb94714 Fixed spelling error in builder/dockerfile/parser/parser.go 
Signed-off-by: Tiffany Jernigan <tiffany.f.j@gmail.com>
Upstream-commit: a07c57f656846ee0de67ac4f575fe5b76d482efb
Component: engine
 2016-06-09 14:49:59 -07:00
Jonathan Stoppani 1a51605407 Support unicode characters in parseWords 
Signed-off-by: Jonathan Stoppani <jonathan.stoppani@divio.com>
Upstream-commit: 6284f04a6b3a9b8127dc166ff84b102c8ad411ce
Component: engine
 2016-06-08 14:05:08 +02:00