Commit Graph

8692 Commits

Author SHA1 Message Date
Aaron Lehmann db5620026d Add support for configs
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-11 13:42:49 -07:00
Aaron Lehmann 15b5dda768 Vendor docker/docker
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-11 13:42:46 -07:00
Daniel Nephin c0cbb6580a Merge pull request #73 from vdemeester/stack-deploy-support-readonly
Add support for `read_only` services in stack deploy
2017-05-11 13:53:45 -04:00
Vincent Demeester 3cac3ec9e0
Return an error instead of an `*InvalidTemplateError`
This mess things up using the `Substitute` method from
outside (i.e. the error is nil but not nil kinda)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-11 17:35:06 +02:00
Vincent Demeester 0ab760a136
Add support for `read_only` services in stack deploy
The `read_only` key in a composefile is not taken into account right
now. Now that services support `--read-only`, so should `stack deploy`

Ref: moby/moby#32994

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-11 17:32:52 +02:00
Daniel Nephin ca0f9e8737 Merge pull request #69 from nishanttotla/fix-makefile-typo
Fix typo in docker.Makefile
2017-05-11 11:02:23 -04:00
Nishant Totla 076976791b
Fix typo in docker.Makefile
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-11 02:02:13 -07:00
Daniel Nephin 0791b27e2b Merge pull request #32 from ColinHebert/label_3.3
Move "labels" to compose 3.3 format
2017-05-10 22:11:42 -04:00
cyli b75858eb09 Propagate the swarm cluster and node TLS info provided by the REST API
responses to the CLI. In `node ls`, display only whether the nodes' TLS
info matches the cluster's TLS info, or whether the node needs cert rotation.

Signed-off-by: Ying Li <ying.li@docker.com>
2017-05-10 17:49:25 -07:00
Tibor Vass 3574e6a674 Merge pull request #59 from crosbymichael/update-term
Update docker dependency for pkg/term
2017-05-10 17:19:01 -07:00
Michael Crosby 56ea98f5ad Update docker dependency
We need the `pkg/term` dep from docker with OPOST added to the MakeRaw
call in order for the new runc 1.0 integration to work properly.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-10 16:07:07 -07:00
Sebastiaan van Stijn 131fe7dfb2 Move "labels" to compose 3.3 format
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-11 08:30:48 +10:00
Brian Goff 0f6f1eafe3 Merge pull request #50 from aaronlehmann/secret-targets
Support Custom Secret Targets
2017-05-10 17:04:20 -04:00
Aaron Lehmann 978aa7ede0 Support Custom Secret Targets
CLI counterpart to https://github.com/moby/moby/pull/32571. Just
involves vendoring github.com/docker/docker/opts.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-10 13:59:33 -07:00
Daniel Nephin d4a2d5a520 Merge pull request #66 from stevvooe/remove-ioutils-dependency-onfprint
cli/command/system: remove ioutils dependency
2017-05-10 16:45:55 -04:00
Stephen J Day 9a892f1bbc
cli/command/system: remove ioutils dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-05-10 13:38:06 -07:00
Daniel Nephin bcc46e75ab Merge pull request #56 from dnephin/add-compose-bindata-check
Add CI validation for compose bindata
2017-05-10 15:49:06 -04:00
Brian Goff b00dd755fc Merge pull request #65 from nishanttotla/update-swarmkit-vendor
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
2017-05-10 15:41:56 -04:00
Nishant Totla 85504b4f98
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-10 11:40:19 -07:00
Vincent Demeester ed5762cb9f Merge pull request #55 from mlaventure/generate-proper-version
Display proper version information
2017-05-10 09:34:22 +02:00
Madhu Venugopal ed7b5bb462 Merge pull request #60 from darrenstahlmsft/revendorGowinio
Move back to upstream go-winio v0.4.0
2017-05-09 22:47:49 -07:00
Darren Stahl 9c32a9d1b7 Move back to upstream go-winio which includes the
needed fixes, as well as the support for go1.8.x

Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-09 16:01:55 -07:00
Gaetan 26e708c29a Merge pull request #58 from gdevillele/pr-update-makefile
add “vendor” target in docker.Makefile
2017-05-09 15:03:52 -07:00
Gaetan de Villele c1f0bee31c update makefiles: add “vendor” target in docker.Makefile…
… so that contributors don’t need “vndr” on their laptop

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-09 14:29:14 -07:00
Kenfe-Mickael Laventure cf51bde7d9 Display proper version information
- The cli version defaults to "unknown-version" unless set via the VERSION env var
- The commit version can be overridden via GITCOMMIT env var
- The build time can be overridden via BUILDTIME env var

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-09 14:22:51 -07:00
Daniel Nephin ef1d58dd87 Add check for compose bindata.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-09 15:42:22 -04:00
Vincent Demeester 079a5598f1 Merge pull request #54 from vdemeester/pull-and-templates
Add github templates and initial poule configuration
2017-05-09 19:58:32 +02:00
Vincent Demeester 1a549c13d3
Add github templates and initial poule configuration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-09 16:57:46 +02:00
Brian Goff 5cbd2b7d6c Merge pull request #52 from cyphar/notty-execid-leak
client: check tty before creating exec job
2017-05-09 09:38:38 -04:00
Aleksa Sarai ee7a956c54
client: check tty before creating exec job
This is necessary in order to avoid execId leaks in the case where a
`docker exec -it` is run without a terminal available for the client.
You can reproduce this issue by running the following command many
times.

  % nohup docker exec -it some_container true

The container `some_container` will have execIDs that will never
normally be cleaned up (because the client died before they were
started).

In addition, this patch adds a docker-inspect step to ensure that we
give "container does not exist" errors consistently.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-05-09 21:07:40 +10:00
Vincent Demeester 3d58c3feac Merge pull request #35 from AliyunContainerService/master
Support placement preferences in stack deployment
2017-05-09 09:40:04 +02:00
Vincent Demeester 2daa598cce Merge pull request #41 from seemethere/fix_dev_null_device
Fix device for vendor target
2017-05-09 09:13:21 +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 d844c487d4 Merge pull request #27 from dnephin/more-linters
More linters and better circle-ci config
2017-05-08 16:30:13 -04:00
Daniel Nephin aa07c40069 Fix vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-08 16:15:54 -04:00
Daniel Nephin 4aa65d9833 Run steps in parallel.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-08 15:57:56 -04:00
Daniel Nephin c31d25653f Add line length linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-08 15:57:56 -04:00
Daniel Nephin 37ccc00d0e Add interfacer linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-08 15:57:50 -04:00
Daniel Nephin d9fde418c0 Merge pull request #28 from dmcgowan/remove-trust-key
Remove unused trust key
2017-05-08 15:16:24 -04:00
Daniel Nephin 5a4873c21a Merge pull request #38 from tiborvass/dont_rm_build_folder
Makefile: on clean, delete files in the build folder, but not the folder
2017-05-08 15:14:15 -04:00
Derek McGowan 515d0fd842 Remove unused trust key
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-05-08 11:49:40 -07:00
Tibor Vass 17311d3d1a Makefile: on clean, delete files in the build folder, but not the folder
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-08 11:24:40 -07:00
Gaetan 2a5d6c8aac Merge pull request #39 from tiborvass/rm_client
rm client and vendor it instead
2017-05-08 11:14:06 -07:00
Eli Uriegas 2792fbce0f Fix device for vendor target
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-05-08 10:56:21 -07:00
Gaetan de Villele 295140edf2 cli: gofmt + goimports
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-08 10:51:30 -07:00
Tibor Vass 57230a7212 rm client and vendor it instead
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-08 10:33:56 -07:00
Gaetan 4411f5c7e0 Merge pull request #40 from gdevillele/pr-update-ci
update circle.yml to fix CI
2017-05-08 10:32:04 -07:00
Gaetan de Villele f35682a2f0 update circle.yml
- update from docker:17.04 to docker:17.05
- install git and ssh to suppress CircleCI warning

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-08 10:25:30 -07:00
Tibor Vass a6feb55a48 Merge pull request #11 from tiborvass/update-cli
Update cli folder with newer changes from moby/moby
2017-05-05 15:04:48 -07:00
Ian Campbell c3648a9c94 Add `docker build --iidfile=FILE`
This is synonymous with `docker run --cidfile=FILE` and writes the digest of
the newly built image to the named file. This is intended to be used by build
systems which want to avoid tagging (perhaps because they are in CI or
otherwise want to avoid fixed names which can clash) by enabling e.g. Makefile
constructs like:

    image.id: Dockerfile
    	docker build --iidfile=image.id .

    do-some-more-stuff: image.id
    	do-stuff-with <image.id

Currently the only way to achieve this is to use `docker build -q` and capture
the stdout, but at the expense of losing the build output.

In non-silent mode (without `-q`) with API >= v1.29 the caller will now see a
`JSONMessage` with the `Aux` field containing a `types.BuildResult` in the
output stream for each image/layer produced during the build, with the final
one being the end product.  Having all of the intermediate images might be
interesting in some cases.

In silent mode (with `-q`) there is no change, on success the only output will
be the resulting image digest as it was previosuly.

There was no wrapper to just output an Aux section without enclosing it in a
Progress, so add one here.

Added some tests to integration cli tests.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-05 12:12:36 -07:00