Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,379 Commits 11 Branches 242 Tags 241 MiB
Commit Graph

83 Commits

Author SHA1 Message Date
Daniel Nephin 9f73b8c718 Support parsing of named pipes for compose volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-09-26 11:24:23 -04:00
Vincent Demeester 0da9f14821
Fix loader error with different build syntax 
`build: .` was not working anymore. Fixing this by adding a new
tranform function for BuildConfig.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-09-20 14:02:33 +02:00
Vincent Demeester f34655ecf8
Tidying up compose/loader test a bit 
- Use `require` instead of `assert` when the assumption is "breaking" for the code
following. For example when asserting an error is not nil and then doing
`err.Error` on it ; if `err` is nil, the test will panic instead of fail.
- Use `assert.Len` when possible. The error message is better.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-09-19 16:48:52 +02:00
Vincent Demeester 2eb31e6b60 Merge pull request #481 from cdrage/add-build-to-service-config 
Add 'build' to types.go
 2017-09-13 18:20:42 +02:00
Charlie Drage 9bdb0763b9 Add 'build' to types.go 
This adds 'build' to types.go in order for projects that use docker/cli
to parse Docker Compose files to correctly retrieve `build` keys

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
 2017-09-13 10:47:17 -04:00
Simon Ferquel a0113c3a44 updated vendoring 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-09-01 19:41:06 -04:00
Daniel Nephin e636a5388c Merge pull request #475 from AliyunContainerService/start_period 
Support start_period for healthcheck in Docker Compose
 2017-08-30 14:11:43 -04:00
Victor Vieux 8ea02f6f08 Merge pull request #477 from dnephin/some-tests-for-container-command 
A few tests for container command
 2017-08-30 09:38:38 -07:00
Li Yi e02fcfd34e Change the type of interval, timeout and start_period of healthcheck from string to * time.Duration 
Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-08-30 23:39:12 +08:00
Daniel Nephin e7f90b6b38 Reduce complexity in cli/command/container 
Add tests for exec and cleanup existing tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-29 19:25:50 -04:00
Li Yi 0abdad615f Support start_period for healthcheck in Docker Compose 
Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-08-29 11:19:29 +08:00
Daniel Nephin d318c4112b Reduce complexity of two formatters 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-28 12:49:07 -04:00
Daniel Nephin 846a31aa50 Use new internal testutil.ErrorContains() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:14:25 -04:00
Joffrey F 1667073908 Update schemas to prevent invalid properties in deploy.resources 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-17 15:58:51 -07:00
Antonis Kalipetis 2950667f07
Support the "order" key in "update_config" for compose 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2017-07-28 22:50:55 +03:00
Liping Xue 27a3080825 Change to enable volume name can be customized. 
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Change to enable volume name can be customized.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Change to enable volume name can be customized.

Remove unused debug info.

Address comments from Daniel and solve the lint error.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to print warning message when name of external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Remove the case that specifying external volume name in full-example.yml.

More fix.

Add unit test.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Daniel, move the schema change to v3.4.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Sebastiaan. Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Misty.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
 2017-07-27 15:09:05 -07:00
Charlie Drage d3f9a6c610 on_failure -> on-failure in compose code 
on_failure should be on-failure

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
 2017-06-28 11:10:02 -04:00
Daniel Nephin 732261f774 Use compose volume spec parser for container volume flag 
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-21 11:16:04 -04:00
Daniel Nephin db6ff357a7 Some improvements to compose volume spec parsing 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-21 11:13:52 -04:00
Daniel Nephin 01e1e58ada Add unused linter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-14 16:54:27 -07:00
Aaron Lehmann 9d12d6fc87 Merge pull request #145 from dnephin/improve-compose-secrets-errors 
Compose: Improve error messages when resource create/update fails
 2017-06-07 18:51:10 +03:00
Vincent Demeester 44ac80881f
Update vendoring of docker/docker 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-06 00:23:21 +02:00
Daniel Nephin 97ebc19438 Use a map instad of a switch/case for Compose transform. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-01 15:22:09 -04:00
Daniel Nephin 729d07a371 Compose: Improve error messages when resource creation/updates fail. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-01 15:03:04 -04:00
John Stephens 9043d39dea
Fix stack compose bind-mount volumes for Windows 
For stack compose files, use filepath.IsAbs instead of path.IsAbs, for
bind-mounted service volumes, because filepath.IsAbs handles Windows
paths, while path.IsAbs does not.

Signed-off-by: John Stephens <johnstep@docker.com>
 2017-05-31 21:13:58 -07:00
Brian Goff e574286ba2 Add support for configs to compose format 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-16 17:10:14 -04:00
Daniel Nephin 90809f8fd9 Merge pull request #71 from thaJeztah/add-credspec-to-compose 
add credential-spec to compose
 2017-05-16 16:45:06 -04:00
Sebastiaan van Stijn 4e7943646b add credential-spec to compose 
Signed-off-by: Michael Friis <friism@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-15 15:00:26 -04:00
Vincent Demeester d7f6563efc
Update cli imports to using local package 
Also, rename a bunch of variable to not *shadow* the `opts` package
name.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-15 14:45:19 +02:00
Li Yi b3459936db Support placement preferences in stack deployment 
Move of moby/moby#32743

Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-05-09 07:00:45 +08:00
Daniel Nephin 8f73a12f9b Add deadcode linter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-02 17:57:46 -04:00
Daniel Nephin 10641c2aae Update imports. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-17 18:07:56 -04:00
Daniel Nephin 1630fc40f8 Import docker/docker/cli 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-04-17 17:40:59 -04:00