Commit Graph
24977 Commits
Author SHA1 Message Date
Aaron Lehmann beb04971ed Fix parallel push of the same image to different registries
Layer uploads are deduplicated by a "key" made up of the layer DiffID
and the repository name. The repository name being used to form this key
was a remote version of the name that didn't include the name of the
registry. Consequently, pushes of the same layer in a repository with
the same remote name to different registries would wrongly be
deduplicated.

Correct the key by using the full name of the repository, which includes
the registry hostname as well as the image's name.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1333ef3ca381976438d4ae10f6b0e9be21e1a9ba
Component: engine
2016-06-17 22:27:03 -07:00
Brian Goff 407690e430 Merge pull request #23579 from tonistiigi/fix-ci-hang
Fix hanging integration tests
Upstream-commit: 8510adf8c856d6f0871650216a0e1d7e6ece46ee
Component: engine
2016-06-15 14:49:54 -04:00
Alexander Morozov abaa81f006 Merge pull request #23538 from anusha-ragunathan/incremental-builds
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
Upstream-commit: 64eb01caf6490b57163e55588bcf295d9645fdae
Component: engine
2016-06-15 10:53:31 -07:00
Tonis Tiigi 85aba87fc8 Fix hanging integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 22f827ababc1910bc48762d7980913497dbc915d
Component: engine
2016-06-15 10:19:45 -07:00
Arnaud Porterie 52c1999aed Merge pull request #23301 from runcom/tmpfs-trump
daemon: allow tmpfs to trump over VOLUME(s)
Upstream-commit: 480d7b310b2b063621eb260aff34e34171694ae3
Component: engine
2016-06-15 17:11:00 +00:00
Antonio Murdaca eb2bdeb9cf daemon: allow tmpfs to trump over VOLUME(s)
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 756f6cef4a1379e59d6511ee000e435d23659153
Component: engine
2016-06-15 16:01:51 +02:00
Vincent Demeester c845c179d8 Merge pull request #23557 from AkihiroSuda/fix-exp-doc
Update experimental/README.md
Upstream-commit: b6a8a3da10698a43043b752552228eed71955994
Component: engine
2016-06-15 13:34:25 +02:00
Akihiro Suda b13c0385b8 Update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: fec98ecca1d82ec1f2e0bd4d5e2c180ef834dc52
Component: engine
2016-06-15 19:14:51 +09:00
Vincent Demeester 02e6cd83ac Merge pull request #23322 from tkopczynski/20784-builder-dockerfile-symlink
Reimplement integration test for symlink Dockerfile as a unit test
Upstream-commit: e08aed59dfd1642ae04ac4eb1055a378d6a572c1
Component: engine
2016-06-15 10:52:49 +02:00
Sven Dowideit a15b623c8b Merge pull request #23505 from londoncalling/add-getstarted-tutorial
ready for merge: surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: da159235595359024ecb63332538c6696f7eb49e
Component: engine
2016-06-15 14:18:09 +10:00
Victoria Bialas 8fead059d3 surfacing Learn by example topics to top level of Docker Engine docs
fixing links after moving surfacing tutorials

fixing more links for the newly located tutorials

WIP: merging 3 getting started tutorials into one to cover all platforms, added new files

fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 0254c12e1e0be7a93e3b28e61586ac66168a9b7c
Component: engine
2016-06-14 21:08:44 -07:00
Arnaud Porterie 5710cba08b Merge pull request #23555 from dperny/change-manager-status-col
Remove the node leader column, show leader as status.
Upstream-commit: 8821233282c187551213497f66248e42de02b167
Component: engine
2016-06-15 03:55:12 +00:00
Tibor Vass 753d7e0d74 Merge pull request #23561 from tiborvass/bump_api_version_to_v1.25
Bump API Version to v1.25
Upstream-commit: 59ef20924279ba174b4ae6abf4c475d013dc1147
Component: engine
2016-06-14 20:18:17 -07:00
Tibor Vass 1de46d8dd4 Bump API Version to v1.25
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 04292192e023372453983cf6318f772922928c4e
Component: engine
2016-06-14 20:03:50 -07:00
Arnaud Porterie f5c8d86b39 Merge pull request #23554 from vieux/node_update_name
fix docker node update via name
Upstream-commit: 9ba0504923879f65d880e3c928c3964d8cbefc6c
Component: engine
2016-06-15 02:36:42 +00:00
Arnaud Porterie 09430f24ff Merge pull request #23553 from icecrime/heartbeat_as_duration
Make `--dispatcher-heartbeat-period` a duration
Upstream-commit: 2e9aac59e20ee376da32c5c85e1b392fc555f9c9
Component: engine
2016-06-15 02:36:17 +00:00
Arnaud Porterie b0143169a4 Merge pull request #23531 from tonistiigi/rm-race
Fix race on force deleting container created by task
Upstream-commit: bd92dd29b9436f4e6a16904e92ce2d965e994d2c
Component: engine
2016-06-15 02:33:56 +00:00
Arnaud Porterie 955da7c9c3 Merge pull request #23524 from aboch/restore
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
2016-06-15 02:33:16 +00:00
Arnaud Porterie 50a4204953 Merge pull request #23551 from tonistiigi/update-swarmkit
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
2016-06-15 02:25:31 +00:00
Arnaud Porterie d191ef8662 Merge pull request #23522 from docker/swarm-stack
Add experimental Docker Stack CLI commands
Upstream-commit: c0677565dc99c67edea0e109e86a7a3dbaca28ac
Component: engine
2016-06-15 02:22:01 +00:00
Tõnis Tiigi 4ac77af3db Merge pull request #23552 from vieux/prevent_panics
prevent some panics in 'service update'
Upstream-commit: aa1b507af6a0c17ea35301d911109db1bb88dd7d
Component: engine
2016-06-14 19:08:46 -07:00
Arnaud Porterie (icecrime) 0b871ed824 Make --dispatcher-heartbeat-period a duration
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb
Component: engine
2016-06-14 18:10:49 -07:00
Drew Erny 921626ca90 Remove the node leader column, show leader as status.
Removes the leader column from node ls and shows whether a node is the
leader in the manager status column instead.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 4104c1dc131b62c033c702719909815fba679774
Component: engine
2016-06-14 17:50:02 -07:00
Arnaud Porterie a1a5b6649c Merge pull request #23548 from vieux/no_more_reject
no more 'docker node reject' in docs
Upstream-commit: e087ba4633c948f00ca3d92c9906fc4cc5db06db
Component: engine
2016-06-15 00:43:58 +00:00
Michael Crosby 668da7d95d Merge pull request #23530 from crosbymichael/exp-tests
Kill containers after restart tests
Upstream-commit: cd03a68d31b33f0020a838bda25c0135f11479e3
Component: engine
2016-06-14 17:43:52 -07:00
Brian Goff 3c08c9d8dd Merge pull request #23446 from tiborvass/plugins-experimental
Plugins: experimental support for new plugin management
Upstream-commit: 6ed921dc38be582939966f71a01ec10f03ed531f
Component: engine
2016-06-14 20:32:14 -04:00
Tonis Tiigi db7d3c4eb4 Update drain test
With the rolling update there can be a possibility
that the container count matches the update has
completely finished yet.

The actual bug for the flakiness was fixed with the
swarmkit update.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b38408fd0287a5d6eda4f8083b83806faf5d5cbd
Component: engine
2016-06-14 17:25:17 -07:00
Tonis Tiigi a7a6c7f5a8 Update daemon to new swarmkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 25a89d73e57e46dd23caebcb6446c7edd6e07f56
Component: engine
2016-06-14 17:23:35 -07:00
Tonis Tiigi d1fb87c721 Update swarmkit to 25572005f
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: cdf279d74df05b2ce2a051fc5b53533ac5249f16
Component: engine
2016-06-14 17:07:14 -07:00
Tibor Vass 636f39c7bd Merge pull request #23546 from sfsmithcha/formatting_updates_and_revisions
update formatting for variables, clarify text in certain topics
Upstream-commit: 93daa10e3ed326ce01cd18904824b0406fe86eb1
Component: engine
2016-06-14 17:04:59 -07:00
Tibor Vass b431a2061e Merge pull request #23547 from icecrime/update_api_reference
Update API reference
Upstream-commit: 381a15279374b482a8257ee277488ae562cf61a1
Component: engine
2016-06-14 17:04:34 -07:00
Tonis Tiigi 08261c5b09 Fix race on force deleting container created by task
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: dcfe99278db113e79dc037a6f854f4cea9eebe22
Component: engine
2016-06-14 16:49:04 -07:00
Lei Jitang dc06e7fb83 Add test case for network restore
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7d0689a8d35e4dd7d569e552957a20ba287c95e6
Component: engine
2016-06-14 16:45:30 -07:00
Lei Jitang a05c8dd297 Daemon to support network restore
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: ecffb6d58cf89371e3f4a20f55c2e614dbdfe880
Component: engine
2016-06-14 16:45:25 -07:00
Arnaud Porterie (icecrime) 954ba685a5 Update API reference
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 98880d8b3938a5cb1b5d7970cbb8efb849a9f97d
Component: engine
2016-06-14 16:41:10 -07:00
Charles Smith 31529f7e86 update formatting for variables, clarify text in certain topics
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 7b0c3066e30d721fb9efbac74e9675e1baeb019a
Component: engine
2016-06-14 16:35:40 -07:00
Michael Crosby be376bb788 Kill containers after restart tests
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e07d78d247c796236e92faed6cfbe05177691d95
Component: engine
2016-06-14 16:17:36 -07:00
Michael Crosby 1d9578a788 Merge pull request #23535 from dmcgowan/cleanup-symlinks-overlay2
Remove symlinks on layer removal for overlay2
Upstream-commit: 8a6cb9c19f5080cbaccdfc1af72ca29b1a715ae5
Component: engine
2016-06-14 16:08:34 -07:00
Sebastiaan van Stijn 7f8d0e6d4a Merge pull request #23476 from mgoelzer/docker112_bash_completions
Bash tab completions for subcommands swarm, service and node
Upstream-commit: 93ef595eb5d1bf0a0abf062ad921ac318d20d720
Component: engine
2016-06-15 00:55:40 +02:00
Victor Vieux 888c53e84d fix docker node update via name
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 78a48af37bec95f010d3355e1434793ff266d12e
Component: engine
2016-06-14 15:55:34 -07:00
Sebastiaan van Stijn ac4f3c4188 docker plugin commandline reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e79873c27c2b3f404db02682bb4f11b5a046602e
Component: engine
2016-06-14 15:50:00 -07:00
Michael Crosby d3cd4d14aa Merge pull request #23415 from aboch/ll
Allow user to specify container's link-local addresses
Upstream-commit: c97fdbe3c5954b2685a8b140f595f06b09191956
Component: engine
2016-06-14 15:47:54 -07:00
Arnaud Porterie 237e46e585 Merge pull request #23525 from dnephin/fix_service_update_repliacs
Fix service update replicas
Upstream-commit: a0e992eff7055e1300fdcdf955c109a9904b0e1d
Component: engine
2016-06-14 22:41:08 +00:00
Victor Vieux 898d7aa097 prevent some panics in 'service update'
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1d380243fcfaab2f4f82fa594e25aae3626ec03d
Component: engine
2016-06-14 15:37:27 -07:00
Michael Crosby a0e666c042 Merge pull request #23540 from cpuguy83/fix_test_cleanup_mounts
TestCleanupMountsAfterGracefulShutdown wait for daemon exit
Upstream-commit: 3f0dbc89b8d27238544c9a0ea9aaafd7a2731206
Component: engine
2016-06-14 15:34:21 -07:00
Arnaud Porterie (icecrime) 76d4651592 Add experimental documentation for stacks
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: ae816baa3c36aaec5e3b7c31425b620b4709ab50
Component: engine
2016-06-14 15:31:45 -07:00
Sebastiaan van Stijn d6790a5164 Merge pull request #23543 from LK4D4/move_sysctls_docs
docs: move sysctls docs to current API version
Upstream-commit: 067b510dfc5b90a1d7712c89e857b6dafb184f24
Component: engine
2016-06-15 00:28:09 +02:00
Alexander Morozov 896826cadf docs: move sysctls docs to current API version
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: de22669377d074a2594de33be01ae4d9723283a8
Component: engine
2016-06-14 15:14:16 -07:00
Victor Vieux 60c51154d7 no more 'docker node reject' in docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c21f8613275ca546b1310999d8714ff2609f33e3
Component: engine
2016-06-14 14:55:25 -07:00
Alessandro Boch 6c19b5ff61 Allow user to specify container's link-local addresses
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00