Commit Graph
36900 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 05b49d64e0 Merge pull request #33110 from dnephin/remove-some-hack
Remove compose-bindata script, it should move to docker/cli
Upstream-commit: 781ff2bcffd3997c16465a852dfedbda128457b0
Component: engine
2017-05-09 19:29:56 +02:00
Sebastiaan van Stijn 0116db53b1 Merge pull request #32930 from gjaskiewicz/master
gcplogging driver MRPB for VM set
Upstream-commit: 3a2d68a8a0191f968014f86500006543ad09897c
Component: engine
2017-05-09 19:29:23 +02:00
Aaron Lehmann d96165077e Merge pull request #33105 from YuPengZTE/devContentReader
check err
Upstream-commit: 9370b6ac2d5de32cbebc063cdb74716b050b9064
Component: engine
2017-05-09 09:44:35 -07:00
Daniel Nephin 3a59c54458 Fix warning for unused build args.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 72cc81ee8dcfca5503f3a02289f8f3d4a08582ad
Component: engine
2017-05-09 11:25:33 -04:00
Sebastiaan van Stijn 8a093adb5c Merge pull request #32670 from perweij/fix-Dockerfile-instruction
Correcting test-instruction.
Upstream-commit: a762ceace4e8c1c7ce4fb582789af9d8074be3e1
Component: engine
2017-05-09 17:20:42 +02:00
Brian Goff 600b71450c Re-run vndr
Now that the CLI is gone there are lots of packages that need to be
pruned from vendor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5122abeb4416c742255cb85d364d7d25d7f5ce32
Component: engine
2017-05-09 10:59:25 -04:00
Vincent Demeester 49eef07b9e Add github templates and initial poule configuration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1a549c13d3
Component: cli
2017-05-09 16:57:46 +02:00
Vincent Demeester 064c831d96 Merge pull request #32983 from allencloud/add-disk-usage-test-in-client
add disk usage test for client package
Upstream-commit: 66bc8f128ca6718f70b1e8d468196457ca6b98bd
Component: engine
2017-05-09 16:44:43 +02:00
Daniel Nephin 4999ae4553 Remove compose-bindata script, it should move to docker/cli
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 47cceb7f2c475e1798e8f339dfd4ad988eeaef42
Component: engine
2017-05-09 10:38:36 -04:00
Sebastiaan van Stijn b7a6083d94 Merge pull request #33062 from ColinHebert/remove_cli_3.3
Remove compose 3.3 schema
Upstream-commit: 7f968435f6e412250b8e6d7211401e2c4b9a2859
Component: engine
2017-05-09 16:21:21 +02:00
Brian Goff 41997fe3f4 Merge pull request #52 from cyphar/notty-execid-leak
client: check tty before creating exec job
Upstream-commit: 5cbd2b7d6c
Component: cli
2017-05-09 09:38:38 -04:00
Justin Cormack c7bf74a6ab Revert "Block obsolete socket families in the default seccomp profile"
This reverts commit 7e3a596a63fd8d0ab958132901b6ded81f8b44c0.

Unfortunately, it was pointed out in https://github.com/moby/moby/pull/29076#commitcomment-21831387
that the `socketcall` syscall takes a pointer to a struct so it is not possible to
use seccomp profiles to filter it. This means these cannot be blocked as you can
use `socketcall` to call them regardless, as we currently allow 32 bit syscalls.

Users who wish to block these should use a seccomp profile that blocks all
32 bit syscalls and then just block the non socketcall versions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: dcf2632945b87acedeea989a5aa36c084a20ae88
Component: engine
2017-05-09 14:26:00 +01:00
Grzegorz Jaśkiewicz ddcae36da7 gcplogging driver MRPB set
Signed-off-by: Grzegorz Jaśkiewicz <gj.jaskiewicz@gmail.com>
Upstream-commit: d925e5047067c2014a3769d41bebd5c837e4cae3
Component: engine
2017-05-09 14:24:43 +02:00
yupengzte adc143e6c5 check err
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 595901bd7ed629222dbcbf43724b2d2bca66464f
Component: engine
2017-05-09 19:24:21 +08:00
Aleksa Sarai 148130f314 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>
Upstream-commit: ee7a956c54
Component: cli
2017-05-09 21:07:40 +10:00
Roberto Gandolfo Hashioka a7451e12cd Add extra prometheus metrics
- buildsTriggered
 - buildsFailed
    - valid options:
        metricsDockerfileSyntaxError,
        metricsDockerfileEmptyError,
        metricsCommandNotSupportedError,
        metricsErrorProcessingCommandsError,
        metricsBuildTargetNotReachableError,
        metricsMissingOnbuildArgumentsError,
        metricsUnknownInstructionError,
        metricsBuildCanceled,
- engineInfo

Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com>
Upstream-commit: a28b173a780cd06db6d93197c54b00a7d616b3dc
Component: engine
2017-05-09 01:04:40 -07:00
Vincent Demeester 434dcf82ed Merge pull request #32939 from jvmatl/master
Improve documentation on the -e flag to the 'run' cli command. 
Upstream-commit: 85a7f4bbc7e3817f7ab0aaff270aad697e86068c
Component: engine
2017-05-09 09:50:21 +02:00
Vincent Demeester d16e6f29c5 Merge pull request #32877 from chchliang/unittest
add testcase with api/errors/errors_test.go
Upstream-commit: 6b3801858c7aec2c2170a9c9a9a8651d071b1549
Component: engine
2017-05-09 09:42:08 +02:00
Vincent Demeester 5361203188 Merge pull request #35 from AliyunContainerService/master
Support placement preferences in stack deployment
Upstream-commit: 3d58c3feac
Component: cli
2017-05-09 09:40:04 +02:00
Vincent Demeester 7c11016102 Merge pull request #33083 from albers/completion-stack-deploy--prune
bash completion for `stack deploy --prune`
Upstream-commit: 040a1d79a2fd2b023f095a705661dfcfbb657f3d
Component: engine
2017-05-09 09:36:12 +02:00
Boaz Shuster 07ecdb31c7 Disable HTML escaping for JSON in formatter
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 5766317e33f088c438eff52124c516f18e764b99
Component: engine
2017-05-09 10:16:10 +03:00
Vincent Demeester 584cb63807 Merge pull request #41 from seemethere/fix_dev_null_device
Fix device for vendor target
Upstream-commit: 2daa598cce
Component: cli
2017-05-09 09:13:21 +02:00
Nishant Totla 9657e321b1 Adding /distribution/{name}/json endpoint to contact registry
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 41b27de41b8b0e034bfe2a3c73b2bc6ff98c7ceb
Component: engine
2017-05-08 16:58:38 -07:00
Nishant Totla fae2fb0e64 Change GetRepository to take Named arguments
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: e842c653a0de4fa7073d2402f4817de308a82bd0
Component: engine
2017-05-08 16:58:38 -07:00
Li Yi 1ae2b9f4e2 Support placement preferences in stack deployment
Move of moby/moby#32743

Signed-off-by: Li Yi <denverdino@gmail.com>
Upstream-commit: b3459936db
Component: cli
2017-05-09 07:00:45 +08:00
Tibor Vass cf964b3db2 Merge pull request #33059 from nishanttotla/vendor-swarmkit
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: 4b846a125b1618e19b389bcdf88b57bef0a05817
Component: engine
2017-05-08 14:27:51 -07:00
Daniel Nephin 1d522f8786 Merge pull request #27 from dnephin/more-linters
More linters and better circle-ci config
Upstream-commit: d844c487d4
Component: cli
2017-05-08 16:30:13 -04:00
Daniel Nephin 0285b89d9b Fix vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aa07c40069
Component: cli
2017-05-08 16:15:54 -04:00
Daniel Nephin 697719d81a Run steps in parallel.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4aa65d9833
Component: cli
2017-05-08 15:57:56 -04:00
Daniel Nephin 5a1580a2fc Add line length linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c31d25653f
Component: cli
2017-05-08 15:57:56 -04:00
Daniel Nephin edf78faba7 Add interfacer linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 37ccc00d0e
Component: cli
2017-05-08 15:57:50 -04:00
Daniel Nephin 8e8e43c61a Merge pull request #28 from dmcgowan/remove-trust-key
Remove unused trust key
Upstream-commit: d9fde418c0
Component: cli
2017-05-08 15:16:24 -04:00
Daniel Nephin 0748b867ce Merge pull request #38 from tiborvass/dont_rm_build_folder
Makefile: on clean, delete files in the build folder, but not the folder
Upstream-commit: 5a4873c21a
Component: cli
2017-05-08 15:14:15 -04:00
Derek McGowan f0517dfa96 Remove unused trust key
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 515d0fd842
Component: cli
2017-05-08 11:49:40 -07:00
Tonis Tiigi ead01af4bc Add builder dev-report for 2017-05-07
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 63c16a443a9d5728dec19ae5de4abb61bdb9441c
Component: engine
2017-05-08 11:36:37 -07:00
Brian Goff 652bcc7bd2 Merge pull request #33092 from tonistiigi/remove-install-binary-client
hack: Remove install-binary-client
Upstream-commit: daa8b262fe44f5e9567477f55e026cca907e9589
Component: engine
2017-05-08 14:32:13 -04:00
Tibor Vass 18fe518a33 Makefile: on clean, delete files in the build folder, but not the folder
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 17311d3d1a
Component: cli
2017-05-08 11:24:40 -07:00
Gaetan dbea31a457 Merge pull request #39 from tiborvass/rm_client
rm client and vendor it instead
Upstream-commit: 2a5d6c8aac
Component: cli
2017-05-08 11:14:06 -07:00
Eli Uriegas 13041f215c Fix device for vendor target
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 2792fbce0f
Component: cli
2017-05-08 10:56:21 -07:00
Gaetan de Villele 2ff5f1eac9 cli: gofmt + goimports
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 295140edf2
Component: cli
2017-05-08 10:51:30 -07:00
Tonis Tiigi d4514d6239 hack: Remove install-binary-client
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 973bce210039085416229c05c97c23feb5db9866
Component: engine
2017-05-08 10:50:31 -07:00
Tibor Vass 82b8acb640 rm client and vendor it instead
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 57230a7212
Component: cli
2017-05-08 10:33:56 -07:00
Tonis Tiigi 35368a62c5 builder: Fix releasing implicit mounts
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 29efb93a19fd46e026055892ccd5c5f44743277d
Component: engine
2017-05-08 10:32:20 -07:00
Gaetan 54cf1dbeb6 Merge pull request #40 from gdevillele/pr-update-ci
update circle.yml to fix CI
Upstream-commit: 4411f5c7e0
Component: cli
2017-05-08 10:32:04 -07:00
Gaetan de Villele 7b959e8107 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>
Upstream-commit: f35682a2f0
Component: cli
2017-05-08 10:25:30 -07:00
Sebastiaan van Stijn dea94ff28a Merge pull request #33085 from thaJeztah/docs-improve-pipe-description
fix confusing description of stdout/stdin pipe
Upstream-commit: dda41118b0b09b0377bf4957051b8f6dcd89ed14
Component: engine
2017-05-08 18:55:04 +02:00
John Howard 23f95e7a60 Windows: Block read-only
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6f7dc65847c45e85e48bb42387114000d2334844
Component: engine
2017-05-08 09:29:37 -07:00
Kenfe-Mickaël Laventure 53d1a4eb83 Merge pull request #33007 from crosbymichael/containerd-rc5
Update moby to containerd and runc 1.0 final rc
Upstream-commit: 7238cca42c3d024adfa030306ad3e3ec4232baed
Component: engine
2017-05-08 09:23:07 -07:00
Sebastiaan van Stijn a1f703247a fix confusing description of stdout/stdin pipe
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c3dff2359dbea4f6f0f001421ddeae4ef76b931f
Component: engine
2017-05-08 15:33:14 +02:00
Sebastiaan van Stijn 20ec9814c7 Merge pull request #32978 from thaJeztah/fix-network-list-example
Update description and example for network-list endpoint
Upstream-commit: afd7e2d2d5ba506205fcc6501d4479c7e2706f50
Component: engine
2017-05-08 15:14:55 +02:00