Victor Vieux
338e7a0b60
Merge pull request #31902 from thaJeztah/master-cherry-pick-31875
...
cherry-pick 31875 - update service-create.md
(cherry picked from commit f148ad38e5
2017-04-03 16:34:20 +02:00
Sebastiaan van Stijn
76a0c400d8
Merge pull request #31901 from davidxia/fix-docs
...
[docs] Fix incorrect `docker inspect` example
(cherry picked from commit b385a9156e
2017-04-03 16:34:11 +02:00
Sebastiaan van Stijn
a95e8154e8
Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
...
docs: remove outdated reference to updating /etc/hosts(cherry picked from commit 5126862d43
2017-04-03 16:33:58 +02:00
Vincent Demeester
aad95ccba9
Merge pull request #31749 from yallop/docs-31047
...
Add documentation for bind mount consistency flags (#31047 ).
(cherry picked from commit 94394026a8
2017-04-03 16:33:41 +02:00
Sebastiaan van Stijn
21d5e8ba4f
Merge pull request #31619 from rcjsuen/patch-1
...
Fix typo in sample output
(cherry picked from commit aa534d3bb2
2017-04-03 16:32:05 +02:00
Sebastiaan van Stijn
1ea62f8807
Merge pull request #31596 from rootsongjc/dry-run-test
...
Wrong entrypoint in docker plugin example
(cherry picked from commit 0bc84fc06c
2017-04-03 16:31:24 +02:00
Vincent Demeester
fcf640efce
Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental
...
Update docs for experimental features
(cherry picked from commit bd811aa4fd
2017-04-03 16:21:25 +02:00
Victor Vieux
30686111ad
install: map debian_version 9.X to debian stretch without lsb_release
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit f8360d002d
2017-03-29 13:47:04 -07:00
Victor Vieux
2f35d73b7d
bump to rc2
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-29 00:16:40 -07:00
Victor Vieux
d408b829fb
Merge pull request #32190 from vieux/cherry-picks-17.04-rc2
...
cherry picks 17.04.0-rc2
2017-03-28 23:50:27 -07:00
Tonis Tiigi
164f1d362e
Return proper exit code on builder panic
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 385f1174ff
2017-03-28 17:34:11 -07:00
French Ben
b82fe694d4
docs: added support for CLI yaml file generation
...
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5443f0152f
2017-03-28 17:29:36 -07:00
Jim Minter
9c05b1049f
Resolve connection reset by peer regression
...
Signed-off-by: Jim Minter <jminter@redhat.com>
(cherry picked from commit dc0ee98805
2017-03-28 17:26:22 -07:00
Vincent Demeester
fbd3d64212
Replace API version comparison by a if…
...
… as we don't know for sure what API version it will be at that time.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 0f9d22cd66
2017-03-28 17:26:12 -07:00
Victor Vieux
c97450059d
Revert "Planned 1.13 deprecation: email from login"
...
This reverts commit a66efbddb84bce232139
2017-03-28 17:26:02 -07:00
Sebastiaan van Stijn
81075fa86c
update "docker daemon" deprecation message for new version scheme
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ba76a0c912
2017-03-28 17:24:53 -07:00
Steve Durrheimer
76c8cbd1fc
Add zsh completion for 'docker build --add-host'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit fbedc588be
2017-03-28 17:24:44 -07:00
Manjunath A Kumatagi
62581bb11c
Fix Healthcheck API doc
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
(cherry picked from commit 4df54695ef
2017-03-28 17:24:35 -07:00
Vincent Demeester
101369979a
Add cli reference docs for root-level commands
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 9cea26bc77
2017-03-28 17:24:23 -07:00
Vincent Demeester
b721d55399
Set the alias to the service name instead of the network name
...
This makes it work a little closer to compose part and it is more
correct 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit ee08c8542a
2017-03-28 17:24:07 -07:00
Darren Stahl
6ddedae595
Windows:Revert change to wait for OOBE
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 6eed7f0cac
2017-03-28 17:23:58 -07:00
Victor Vieux
73b512220d
Merge pull request #31977 from cyli/bump-go-connections-17.04
...
Bump go connections for 17.04 and use either system pool or custom CA pool when connecting from client->daemon [17.04]
2017-03-23 17:07:28 -07:00
Victor Vieux
5550606c15
Merge pull request #32033 from AkihiroSuda/cherrypick-30781
...
[17.04] compose: fix environment interpolation from the client
2017-03-23 10:10:42 -07:00
Akihiro Suda
fac9e24c7c
compose: update the comment about MappingWithEquals
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-23 02:09:26 +00:00
Daniel Nephin
7a4482a144
Fix environment resolving.
...
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-23 02:09:26 +00:00
Akihiro Suda
88c18fb45c
compose: fix environment interpolation from the client
...
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-23 02:09:26 +00:00
Sebastiaan van Stijn
94c4b33730
Merge pull request #31970 from vdemeester/cherry-pick-31621
...
[17.04] Cherry-pick: Windows: Fix Docker hanging with named pipes and stdin
2017-03-21 21:20:49 +01:00
Ying Li
60d17202f0
Use either the system root pool or an empty cert pool with custom CA roots,
...
and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon
Signed-off-by: Ying Li <ying.li@docker.com>
2017-03-21 10:54:56 -07:00
Ying Li
3c05ff4aef
Bump the version of go-connections
...
Signed-off-by: Ying Li <ying.li@docker.com>
2017-03-21 10:40:39 -07:00
David Gageot
f3cc477e7d
Windows: Fix Docker hanging with named pipes and stdin
...
Fixes #31922
Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43 )
merged
Signed-off-by: David Gageot <david@gageot.net>
2017-03-21 16:13:41 +01:00
Vincent Demeester
9b6603e124
Merge pull request #31870 from aaronlehmann/vendor-swarmkit-d316a73f
...
[17.04] Vendor swarmkit d316a73
2017-03-21 09:46:03 +01:00
Victor Vieux
9b80fad9b4
Merge pull request #31899 from thaJeztah/17.04-cherry-pick-31894
...
[17.04] cherry pick 31894 - Fix compose schema id for v3.2
2017-03-16 15:36:02 -07:00
Sebastiaan van Stijn
581c601408
Merge pull request #31894 from dnephin/fix-schema-id
...
Fix compose schema id for v3.2
(cherry picked from commit 3eaeee07c3
2017-03-16 21:21:49 +01:00
Vincent Demeester
f15f593751
Merge pull request #31848 from thaJeztah/17.04.0-changelog-updates
...
[17.04.x] deprecation and changelog updates
2017-03-16 10:08:27 +01:00
Aaron Lehmann
9bede621f1
Vendor swarmkit d316a73
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-15 17:17:58 -07:00
Victor Vieux
d2532c636f
Merge pull request #31853 from mlaventure/update-containerd-17.04
...
[17.04] Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
2017-03-15 10:51:54 -07:00
Sebastiaan van Stijn
2387faa6de
deprecation and changelog updates for 17.04
...
- Interacting with V1 registries is not yet disabled by default, so moving the deprecation version
- Added various entries to the changelog, and moved some to a different section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-15 18:40:47 +01:00
Kenfe-Mickael Laventure
99280133c2
Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
...
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-15 08:09:54 -07:00
Victor Vieux
b2fc918c5a
Merge pull request #31811 from vieux/bump_17.04.0
...
bump 17.04.0-rc1
2017-03-14 20:40:32 -07:00
Victor Vieux
6d027bc8f7
bump 17.04.0-rc1
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-14 20:35:50 -07:00
Victor Vieux
0b9b7906af
Merge pull request #31833 from tonistiigi/docker-group
...
Fix default socket group regression
2017-03-14 20:34:42 -07:00
Anusha Ragunathan
95b46ff68f
Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format
...
docker stack deploy interpolation format error due to not escaping $ now includes a hint
2017-03-14 17:14:09 -07:00
Victor Vieux
cec9594947
Merge pull request #31790 from mlaventure/devicecgrouprules-api-swagger
...
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
2017-03-14 16:51:09 -07:00
Tonis Tiigi
c7c2cd4e8e
Fix default socket group regression
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-14 16:09:08 -07:00
Victor Vieux
f7cfacbfe9
Merge pull request #31824 from albers/completion-update--service-logs
...
Update bash completion for `docker service logs`
2017-03-14 14:44:36 -07:00
Victor Vieux
f72404e48d
Merge pull request #31686 from AkihiroSuda/fix-defer-it-on-swarm
...
integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
2017-03-14 14:41:41 -07:00
Victor Vieux
1a24abe42d
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
2017-03-14 11:53:52 -07:00
Daniel Nephin
cd56476f18
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
2017-03-14 14:10:24 -04:00
Justin Cormack
49376cddab
Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy
...
Add expanded mount format to stack deploy
2017-03-14 17:53:28 +00:00
Victor Vieux
08bbd434f5
Merge pull request #31586 from aaronlehmann/digest-pin-context
...
cluster: Renew the context after communicating with the registry
2017-03-14 09:46:15 -07:00
