Daniel Nephin
9b7bd69cfc
Support entrypoint, labels, and user in the bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-06-14 13:00:12 -04:00
Victor Vieux
ffeb9fcb2a
fix 2 potential panics with mounts in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-06-14 09:25:39 -07:00
Aanand Prasad
1ea9dda1d3
Implement 'docker-compose push' and 'docker-compose bundle'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-06-14 12:06:14 -04:00
Vincent Demeester
2e6db51de7
Migrate cp command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-06-14 17:16:59 +02:00
Aanand Prasad
21f20cbc9b
Merge pull request #3449 from Andrey9kin/ready/3281
...
Fix #3281 : Unexpected result when using build args with default values
2016-06-14 08:05:07 -07:00
Kenfe-Mickael Laventure
77efe6dffc
Skip TestRunResolvconfUpdate as it is unstable
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
1aec3bacfd
Vendor in new runc binary with userns fix
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
1f266d40f3
Fix race in DockerExternalGraphdriverSuite.TestExternalGraphDriver
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
6e9bf4d316
Add bash completion support for --runtime and --add-runtime
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
1a6ed50e1f
Add missing completion for --config-file
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
7b2e5216b8
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
2e9ea5c194
Update containerd and runc vendoring
...
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-06-14 07:47:31 -07:00
Sven Dowideit
c913dd5f57
Merge pull request #23489 from thaJeztah/fix-indentation
...
API docs cleanup
2016-06-14 21:49:48 +10:00
KOBAYASHI Shinji
ec4697ea33
Add SSH logs when provisioning with RedHat derivatives
...
Fixes #3507
Signed-off-by: KOBAYASHI Shinji <koba@jp.fujitsu.com >
2016-06-14 11:13:32 +00:00
Sven Dowideit
2a96ac66ea
Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
...
surfacing Learn by example topics to top level of Docker Engine docs
2016-06-14 21:10:17 +10:00
Lei Jitang
74873f192a
Merge pull request #23506 from albers/completion-daemon---live-restore
...
bash completion for `docker daemon --live-restore`
2016-06-14 17:24:00 +08:00
Sebastiaan van Stijn
31e48e85ef
Merge pull request #23501 from dmcgowan/fix-overlay-diff-test
...
Remove failing overlay test
2016-06-14 10:49:42 +02:00
Sebastiaan van Stijn
1cb16a1b41
Merge pull request #23484 from onlyjob/bash-completion
...
Fix syntax errors in bash-completion (Closes : #23483 )
2016-06-14 10:13:29 +02:00
Tibor Vass
a1e319e847
Merge pull request #23361 from docker/swarm
...
Add dependency to docker/swarmkit
2016-06-14 00:55:55 -07:00
Harald Albers
73882e8f83
bash completion for docker daemon --live-restore
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-06-14 09:14:25 +02:00
Vincent Demeester
c69614deae
Merge pull request #23490 from shishir-a412ed/dm_options_modularized
...
Modularize dm.use_deferred_removal and dm.use_deferred_deletion logic.
2016-06-14 08:47:43 +02:00
Vincent Demeester
7d988a7aa6
Merge pull request #23093 from tkopczynski/20784-builder-dockerfile-outside-context
...
Builder integration tests for Dockerfile outside context as a unit test
2016-06-14 08:44:24 +02:00
Derek McGowan
0e74aabbb9
Remove failing overlay test
...
Diff apply is sometimes producing a different change list causing the tests to fail.
Overlay has a known issue calculating diffs of files which occur within the same second they were created.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-06-13 22:34:57 -07:00
Charles Smith
ea4fef2d87
add tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
2016-06-13 22:17:15 -07:00
Amit Shukla
9acf97b72a
CLI docs
...
Signed-off-by: Amit Shukla <amit.shukla@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-06-13 22:17:15 -07:00
Daniel Nephin
12a00e6017
Add Swarm management CLI commands
...
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.
This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-06-13 22:17:15 -07:00
Tibor Vass
4940985340
Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb
...
Do not overwrite already published deb files when releasing
2016-06-13 22:16:53 -07:00
Arnaud Porterie (icecrime)
d4abe1d84a
Add swarm api reference docs
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
2016-06-13 22:16:18 -07:00
Tonis Tiigi
0d88d5b64b
Swarm integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-06-13 22:16:18 -07:00
Tonis Tiigi
534a90a993
Add Swarm management backend
...
As described in our ROADMAP.md, introduce new Swarm management API
endpoints relying on swarmkit to deploy services. It currently vendors
docker/engine-api changes.
This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-06-13 22:16:18 -07:00
Tonis Tiigi
44793049ce
Add dependency to docker/swarmkit
...
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-06-13 22:16:18 -07:00
Allen Sun
0121b63c22
Merge pull request #2347 from NanXiao/issue-9998
...
Edited cluster/cluster.go
2016-06-14 13:13:16 +08:00
Alexander Morozov
c81c131a40
Merge pull request #23373 from capkurmagati/23211-spf13-cobra-ps
...
Migrate ps command to cobra
2016-06-13 22:12:20 -07:00
French Ben
a6bb087ce2
Modified circleCI push
...
Signed-off-by: French Ben <frenchben@docker.com >
2016-06-13 21:34:36 -07:00
Michael Crosby
3020081e94
Merge pull request #23213 from crosbymichael/restore-option
...
Add --live-restore flag
2016-06-13 20:57:19 -07:00
Tianyi Wang
5a0b53b5a3
Migrate ps command to cobra
...
Signed-off-by: Tianyi Wang <capkurmagati@gmail.com >
2016-06-14 11:59:37 +09:00
Michael Crosby
d705dab1b1
Add --live-restore flag
...
This flags enables full support of daemonless containers in docker. It
ensures that docker does not stop containers on shutdown or restore and
properly reconnects to the container when restarted.
This is not the default because of backwards compat but should be the
desired outcome for people running containers in prod.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2016-06-13 19:16:26 -07:00
Aanand Prasad
2123906586
Merge pull request #3577 from sanmai-NL/3576-byte_str_fix
...
Fix byte/str typing error
2016-06-14 01:58:27 +01:00
Nathan LeClaire
91ec013436
Merge pull request #3502 from nathanleclaire/plugin_exit
...
Add code to exit when heartbeat call fails
2016-06-13 17:52:14 -07:00
Nathan LeClaire
7986255782
Merge pull request #3503 from nathanleclaire/vmwarefusion_fix_cpus
...
Fix driver CPU inconsistency
2016-06-13 17:51:47 -07:00
Aanand Prasad
59e96fea4f
Merge pull request #3588 from shin-/3285-root-mount
...
Fix split_path_mapping behavior when mounting "/"
2016-06-14 01:45:20 +01:00
French Ben
5a9bce1da4
Merge pull request #1757 from docker/1.12-rc
...
1.12 rc
2016-06-13 17:38:03 -07:00
Richard Scothern
ccfa25cf00
If resumable digest support is disabled, detct this when closing the blobwriter
...
and allow the close to continue. Also update the name of the function.
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-06-13 17:35:06 -07:00
Richard Scothern
1fc752c718
Merge pull request #1706 from aibaars/registry-size-close
...
Blobwriter: call BlobWriter.Size after BlobWriter.Close
2016-06-13 16:29:35 -07:00
Richard Scothern
337ceb2b40
Merge pull request #1786 from RichardScothern/admin
...
Prepare for the release.
2016-06-13 16:09:09 -07:00
Nathan LeClaire
c9e8a87a3b
Fix driver CPU inconsistency
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-06-13 16:06:08 -07:00
Richard Scothern
6e2dd4fa68
Prepare for the release.
...
Update .mailmap, AUTHORS and MAINTAINERS files.
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-06-13 16:03:16 -07:00
Nathan LeClaire
d2fe2c281a
Add code to exit when heartbeat call fails
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-06-13 16:03:10 -07:00
French Ben
073a83b34e
Modified version to match engine
...
Signed-off-by: French Ben <frenchben@docker.com >
2016-06-13 16:00:07 -07:00
Nathan LeClaire
3dd8466ca8
Merge pull request #3489 from legal90/fix-doc-parallels
...
docs: Fix the name of "Parallels Desktop for Mac"
2016-06-13 16:00:05 -07:00