toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,996 Commits 3 Branches 295 Tags
99862c3f0bf9bf4aa915e3cbd5f2ecc4f2b674c9
Commit Graph
24996 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud PorterieandGitHub 99862c3f0b Merge pull request #23603 from mlaventure/revert-runc-to-mainstream 
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Upstream-commit: 9cdb6357e2f8c7561ba580c1e16de81d24e1de99
Component: engine
 2016-06-16 05:08:44 +00:00
Alexander MorozovandGitHub c6395cdf74 Merge pull request #23577 from anusha-ragunathan/strings_conversion 
Avoid back and forth conversion between strings and bytes.
Upstream-commit: c18e036d36be09f5144ac99266a2b525cb79ce78
Component: engine
 2016-06-15 21:41:04 -07:00
Arnaud PorterieandGitHub fc28f1b8ca Merge pull request #23601 from dnephin/change_header 
Change SCALE to REPLICAS.
Upstream-commit: 8ab79f1f7035288743882a6f0fa8bacc6c8454fa
Component: engine
 2016-06-16 04:18:49 +00:00
Arnaud PorterieandGitHub 9f6da823f0 Merge pull request #23558 from mlaventure/fix-arm-test-for-multiple-runtimes 
Fix TestRunWithRuntime* on arm
Upstream-commit: 17bf13b1b2b44e0351218fd0b25d716687f0df32
Component: engine
 2016-06-16 04:09:15 +00:00
Tõnis TiigiandGitHub 1063457ce1 Merge pull request #23602 from crosbymichael/bump-libnetwork 
Update libnetwork to 96d45528599c32354230480a1ebc0
Upstream-commit: 18a20c859f6fc9ad5aa51a0e281223b861aa8f62
Component: engine
 2016-06-15 19:01:29 -07:00
Sven DowideitandGitHub 0c8ccf3ca9 Merge pull request #23604 from londoncalling/getstarted-tutorial-updates 
fixing links, images and missing files in Getting Started tutorial
Upstream-commit: 1ba9e3cba4a27e67bd233668d9cb05b000ad2571
Component: engine
 2016-06-16 11:50:28 +10:00
Victoria Bialas cb9a8acf9f fixing links and merge conflicts 
updated link to faqs/troubleshoot to point to new location /toolbox

fixed docker-for-mac link error

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 1d80f8ca193139755de935fa6567a32734038cac
Component: engine
 2016-06-15 18:37:50 -07:00
Sebastiaan van StijnandGitHub dd45c05df9 Merge pull request #23510 from sbose78/23376-update-centos-yum-repo-version 
Fixes #23376 Broken URL for Centos yum repo for docker fixed to harcoded version number.
Upstream-commit: 0c78a7dd64c4c0b11aae040fadbecee2a7fdf5ae
Component: engine
 2016-06-16 02:43:13 +02:00
Kenfe-Mickael Laventure 4a8d3f13a7 Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b675124cf5fc96a6c329b5580ef60304089270c6
Component: engine
 2016-06-15 15:11:50 -07:00
Michael Crosby 6a10bc5376 Update libnetwork to 96d45528599c32354230480a1ebc0 
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e927df7b4b58099113b5086371b1d80ff517f564
Component: engine
 2016-06-15 15:07:04 -07:00
Daniel Nephin 93b2574efc Change SCALE to REPLICAS. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
 2016-06-15 17:57:59 -04:00
Arnaud PorterieandGitHub eb4a784598 Merge pull request #23565 from SvenDowideit/fix-links-tutorials 
fix links for #23505
Upstream-commit: eab3a1fa553360d39d30e14e7f23cdc769dc4dc5
Component: engine
 2016-06-15 21:24:22 +00:00
Brian GoffandGitHub a0153fe543 Merge pull request #23542 from mavenugo/aliases 
Use service alias and configure service VIP or dns-rr
Upstream-commit: 011774e6f0eb5db13fb084b2b8d4d499a9f0548b
Component: engine
 2016-06-15 16:18:50 -04:00
Brian GoffandGitHub 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 MorozovandGitHub 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 PorterieandGitHub 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
Anusha Ragunathan c6bff6e7a4 Avoid back and forth conversion between strings and bytes. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: d6d448aab8e303a351b763f6a77b909fadb7344b
Component: engine
 2016-06-15 09:55:40 -07: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 DemeesterandGitHub 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 DemeesterandGitHub 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 965831ca81 fix links for #23505 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fa94eb46041ad309468dbbd29faba2053f402096
Component: engine
 2016-06-15 04:46:40 +00:00
Sven DowideitandGitHub 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 PorterieandGitHub 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 VassandGitHub 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
Madhu Venugopal e306e601d2 Use service alias and configure container's --net-alias 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f
Component: engine
 2016-06-14 19:50:34 -07:00
Madhu Venugopal efcb8ab316 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 5af8e2a9c08439049da9a9abc24145c3d1f2e9de
Component: engine
 2016-06-14 19:50:34 -07:00
Madhu Venugopal 241219195c Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: f2f97f768e51f817336cd56456158bc32ab3b977
Component: engine
 2016-06-14 19:50:34 -07:00
Arnaud PorterieandGitHub 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 PorterieandGitHub 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 PorterieandGitHub 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 PorterieandGitHub 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 PorterieandGitHub 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 PorterieandGitHub 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 TiigiandGitHub 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
Kenfe-Mickael Laventure fbfc97dd82 Fix TestRunWithRuntime* on arm 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: bd6317031bb8f7e1a82cbfd254fe60e0de703524
Component: engine
 2016-06-14 18:59:22 -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 PorterieandGitHub 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 CrosbyandGitHub 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 GoffandGitHub 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 VassandGitHub 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 VassandGitHub 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