toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,548 Commits 3 Branches 295 Tags
9ef77e3f82553acd0a0134cd2904586ba4e18707
Commit Graph
20548 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Murdaca 9ef77e3f82 Merge pull request #18592 from hqhq/hq_fix_start 
Add lock for container update
Upstream-commit: 241f6d71078916e987e131e3dd07beb0c5a1242e
Component: engine
 2015-12-12 12:17:18 +01:00
Sebastiaan van Stijn 579142820b Merge pull request #18613 from calavera/flack_streaming_events_test 
Log events stream when TestEventStreaming fails.
Upstream-commit: 8d36f097cfe8fd3a4e6bed6123fb1fea24889c7b
Component: engine
 2015-12-12 00:40:25 +01:00
Sebastiaan van Stijn 0a2fe060b5 Merge pull request #18608 from calavera/rename_get_to_get_container 
Rename `Daemon.Get` to `Daemon.GetContainer`.
Upstream-commit: 83d0a8647037954fafe646a4261ccfb427ea8ff9
Component: engine
 2015-12-12 00:10:42 +01:00
David Calavera aa7be52b1d Log events stream when TestEventStreaming fails. 
Let the tag event some more time to be emitted.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a3056f9f72baf71655a47ac5b891c892d0174ac4
Component: engine
 2015-12-11 17:20:40 -05:00
David Calavera 0d0535be72 Merge pull request #18610 from runcom/fix-warn 
api: client: info: add newline after warning
Upstream-commit: 91799c232e5f4e2f5dbfd78e0520a97eb2d826c0
Component: engine
 2015-12-11 13:41:14 -08:00
Sebastiaan van Stijn ee840662b3 Merge pull request #18591 from calavera/inspector_tests 
Make sure template inspector always prints a carriage return.
Upstream-commit: a84982a9c764a86358a6f53715efdc9caa0814e8
Component: engine
 2015-12-11 22:03:42 +01:00
Antonio Murdaca 85dc531227 api: client: info: add newline after warning 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: bb3d7e1e6543a49fd344e765169265a08a19331a
Component: engine
 2015-12-11 20:54:51 +01:00
David Calavera 2cee7ddb46 Rename Daemon.Get to Daemon.GetContainer. 
This is more aligned with `Daemon.GetImage` and less confusing.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d7d512bb927023b76c3c01f54a3655ee7c341637
Component: engine
 2015-12-11 12:39:28 -05:00
Alexander Morozov c6e3ae9ff6 Merge pull request #18595 from mariussturm/gelf-no-trim-18568 
don't trim GELF message
Upstream-commit: 5525593a681a478dc51d7ce10a8cb3135d39e785
Component: engine
 2015-12-11 07:39:44 -08:00
Tibor Vass 96b1d45a1b Merge pull request #18242 from jfrazelle/i-have-no-idea 
Remove ipc rule in docker-engine apparmor profile
Upstream-commit: cd648dce3adf0f15059eb848d3140d5c7b9f350f
Component: engine
 2015-12-11 11:23:41 +01:00
Marius Sturm 46aa4e0b30 dont trim gelf log message 
Signed-off-by: Marius Sturm <marius@graylog.com>
Upstream-commit: a31435c8a2c4560b6e1a0e84450c45490fa587be
Component: engine
 2015-12-11 10:28:24 +01:00
Qiang Huang 88d252998b Add lock for container update 
Container needs to be locked when updating the fields, and
this PR also remove the redundant `parseSecurityOpt` since
it'll be done in `setHostConfig`.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 464eefd7957c3e0c7bcfb80bdc96ef8790687615
Component: engine
 2015-12-11 10:33:13 +08:00
David Calavera 34ad96c328 Make sure template inspector always prints a carriage return. 
To match with the raw inspector.
Adds tests to verify its functionality.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bc02d42d9ec6d6741946e2edbd13ff8a78bbdb80
Component: engine
 2015-12-10 21:13:13 -05:00
Sebastiaan van Stijn 98c3f4897a Merge pull request #18577 from devvyn/patch-1 
Update custom-docker0.md (corrections)
Upstream-commit: 23bd9b881fd4a04d3f363d4d5205f7ac63a904e5
Component: engine
 2015-12-11 02:38:24 +01:00
Sebastiaan van Stijn 4efe3c0424 Merge pull request #18142 from ekuric/mkimage 
mkimage-yum.sh to support dnf
Upstream-commit: 8cd356630a84699485432fd9ecdde18c0b866a34
Component: engine
 2015-12-11 02:27:13 +01:00
Jess Frazelle 0da90605c7 Merge pull request #18564 from runcom/warn-on-loopback 
api: client: info: print a warning if dm is using a loopback file
Upstream-commit: a16a1d75d928000c8e8e9995d8843a685aa5df65
Component: engine
 2015-12-11 10:11:03 +10:00
David Calavera 87797addd5 Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device 
Fix typo in named test and docs.
Upstream-commit: b89676beadce5a078dd8fc8b37ce00729e6e7232
Component: engine
 2015-12-10 15:19:41 -08:00
Alexander Morozov 9847131043 Merge pull request #18353 from aaronlehmann/transfer-manager 
Improved push and pull with upload manager and download manager
Upstream-commit: ac453a310bac6bdd7cd9d780a63d4168064570d1
Component: engine
 2015-12-10 14:52:48 -08:00
Christopher Jones 1aaaffc214 Fixed typo change deivce to device. 
This changes deivce to device in daemon, test and docs.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 7c077c2c3443fdb9b13b7790bc96cdaa287cf381
Component: engine
 2015-12-10 15:23:05 -06:00
Alexander Morozov aef06e4e19 Merge pull request #18566 from coolljt0725/fix_18544 
Probably fix flaky test TestExecTTY
Upstream-commit: 9381c744b89bf006e90483738601a24323647678
Component: engine
 2015-12-10 12:53:47 -08:00
David Calavera 3ca5c467e0 Merge pull request #18557 from cpuguy83/use_correct_resize_fn 
Use correct fn for resizing TTY
Upstream-commit: a0f80079b8e699b992f34cc76a97ba578421fdbb
Component: engine
 2015-12-10 12:37:13 -08:00
Devvyn Murphy 443714c6b5 Update custom-docker0.md (corrections) 
Corrected outdated internal link (regarding ```ip_forward``` system setting) . Corrected missing newline before bulleted list (for options configurable at server startup).

Signed-off-by: Devvyn Murphy <devvyn@devvyn.com>
Upstream-commit: 76de01c13833e42c89afa7e46d97bb4864a9be9b
Component: engine
 2015-12-10 13:24:02 -06:00
Vincent Demeester ff45cefcc9 Merge pull request #18555 from runcom/clean-devmapper 
devmapper: remove unused var
Upstream-commit: 13155ac47ea27eceda2c59d42e05e4b6ab1f516a
Component: engine
 2015-12-10 18:17:04 +01:00
David Calavera 77cd3e6f51 Merge pull request #18459 from Microsoft/jjh/winci-bash4fix 
Windows CI Fix: Allow bash v4
Upstream-commit: 31a31adf7eeebfb0b5ca8622c33ff47d66c6c067
Component: engine
 2015-12-10 08:58:32 -08:00
Phil Estes db749df51c Merge pull request #18197 from nalind/workaround-go-libgcc 
Work around a linking problem on 32-bit arches
Upstream-commit: 2ea48e9fc09ba83785355c5d073e9bfae81ea266
Component: engine
 2015-12-10 11:50:03 -05:00
Alexander Morozov bfa780294c Merge pull request #18565 from hqhq/hq_fix_ensure_format 
Fix format issue
Upstream-commit: 8e2c27abeb5c870045aa8ba8fd8863e8e2d2fd84
Component: engine
 2015-12-10 08:27:15 -08:00
Antonio Murdaca e467805405 api: client: info: print a warning if dm is using a loopback file 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a2c4c0cd3a2e5b58b36718290cb7c31f99f6495e
Component: engine
 2015-12-10 14:05:28 +01:00
Sebastiaan van Stijn b7df006fa3 Merge pull request #18562 from haoshuwei/modify-wordspelling-in-docker-stats 
Modify word spelling  in stats.go's comments
Upstream-commit: 3d82564c7a6ae139879b869a987bf9274ed0275d
Component: engine
 2015-12-10 13:32:10 +01:00
Lei Jitang 44d9263f75 Probably fix flaky test TestExecTTY 
sleep 2 seconds before exec exit to make sure
the output of `cat /foo` will be read

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e16eacad44f1485d6857a61e2e7690e0a37ddec
Component: engine
 2015-12-10 04:13:58 -05:00
Sebastiaan van Stijn 175c786e42 Merge pull request #18553 from calavera/remove_specific_go_1_5_calls 
Remove call to template.Option when building with 1.4.
Upstream-commit: d46650b3c7700cd6828f57409e981d8312c3fd32
Component: engine
 2015-12-10 09:28:00 +01:00
Antonio Murdaca cb952213f7 devmapper: remove unused var 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 037cbcec989f7867b6062455e8b042b8d2b0ab18
Component: engine
 2015-12-10 08:28:02 +01:00
Qiang Huang fa08b99054 Fix format issue 
Remove prefix and suffix spaces and tabs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: bd00905614346f6b9a6289bd1042252f8d99df2e
Component: engine
 2015-12-10 15:18:16 +08:00
Shuwei Hao 9b469321b5 Modify word spelling errors in stats.go 
Signed-off-by: Shuwei Hao <haosw@cn.ibm.com>
Upstream-commit: 413e058b72eab50001496b1a4d0af7393be26df0
Component: engine
 2015-12-10 06:57:25 +00:00
Brian Goff 72c8e6b470 Merge pull request #18550 from ibuildthecloud/panic 
Don't dereference HostConfig.MemorySwapiness if nil
Upstream-commit: ff0e33824a09284084683d9e00f0f7bcc6950a76
Component: engine
 2015-12-09 23:11:18 -05:00
Brian Goff 7e3377f7d7 Use correct fn for resizing TTY 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3260ddb10bff8d1b5cabe547ecb77e19d379a3c6
Component: engine
 2015-12-09 22:55:01 -05:00
Aaron Lehmann 32056292f5 Update docs for addition of transfer manager 
Closing the HTTP connection requesting a push or pull will cancel the
push or pull. This behavior also applies to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d92e7ad7356e10c86e7dc479356578ac40fd2bbd
Component: engine
 2015-12-09 19:13:35 -08:00
Aaron Lehmann 547342d777 Improved push and pull with upload manager and download manager 
This commit adds a transfer manager which deduplicates and schedules
transfers, and also an upload manager and download manager that build on
top of the transfer manager to provide high-level interfaces for uploads
and downloads. The push and pull code is modified to use these building
blocks.

Some benefits of the changes:

- Simplification of push/pull code
- Pushes can upload layers concurrently
- Failed downloads and uploads are retried after backoff delays
- Cancellation is supported, but individual transfers will only be
  cancelled if all pushes or pulls using them are cancelled.
- The distribution code is decoupled from Docker Engine packages and API
  conventions (i.e. streamformatter), which will make it easier to split
  out.

This commit also includes unit tests for the new distribution/xfer
package. The tests cover 87.8% of the statements in the package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 572ce802306a4e919802e5b77cbeca94acda7c0a
Component: engine
 2015-12-09 19:13:35 -08:00
David Calavera dd78e16329 Merge pull request #18552 from dnephin/move_network_types 
Move networking api types to the api/types/networking package.
Upstream-commit: 10bbe0ee7ccb3f8e6c37f84b89a887e882f83944
Component: engine
 2015-12-09 17:42:14 -08:00
David Calavera fb4d3eebd9 Merge pull request #18417 from jfrazelle/remove-parallel 
remove parallel we no longer use it
Upstream-commit: 0b930e8fec026f0a7c84e3bccbc375c2443ae33d
Component: engine
 2015-12-09 16:26:02 -08:00
David Calavera e15adec58b Remove call to template.Option when building with 1.4. 
Windows still relies on 1.4.2 to build Docker.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 6df3fc51759a6219e965a30c413cb43ddbc897c9
Component: engine
 2015-12-09 17:30:16 -05:00
Daniel Nephin 1c526ceb5c Move networking api types to the api/types/networking package. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: efda9618db07152ce6a94e0ac391ba58d1463fcd
Component: engine
 2015-12-09 13:55:59 -08:00
Darren Shepherd 19d19aefcd Don't dereference HostConfig.MemorySwapiness if nil 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 5ac12c418f163a49ad3355506fc8ed632905dbd9
Component: engine
 2015-12-09 14:47:51 -07:00
Sebastiaan van Stijn 4b66f2a240 Merge pull request #18541 from programmerq/inspect_command_ip_address 
Add the actual command in this example.
Upstream-commit: 1d775a54cc67e27f755c7338c3ee938498e845d7
Component: engine
 2015-12-09 21:10:46 +01:00
Brian Goff 4abf2d4ba4 Merge pull request #18538 from estesp/aufs-whiteout-userns-fix 
Skip aufs whiteout files on userns translation to container
Upstream-commit: 8b6132aa15367456b04cf659045e7996252df1f0
Component: engine
 2015-12-09 14:47:01 -05:00
Sebastiaan van Stijn e5a75c852e Merge pull request #18533 from thaJeztah/fix-oracle-package-name 
docs: fix incorrect package name on Oracle Linux
Upstream-commit: 7470e39c736db638588976f3d699a88b53b197c5
Component: engine
 2015-12-09 20:24:39 +01:00
Tibor Vass ae9abb18b8 Merge pull request #18472 from calavera/api_client_lib 
Api client lib
Upstream-commit: 375f754f49ee6e9de942816a47a21a715fe3bacb
Component: engine
 2015-12-09 19:17:11 +01:00
David Calavera 9f21e07bc2 Merge pull request #18540 from thaJeztah/remove-redundant-check 
Remove redundant check
Upstream-commit: 61b832dc5cb72401b4e0358b8b15854404adcd89
Component: engine
 2015-12-09 09:48:11 -08:00
Jeff Anderson 04396c69aa Add the actual command in this example. 
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: d8d38f234563a3be0b23cc94df3a9453eacfdee8
Component: engine
 2015-12-09 10:17:39 -07:00
David Calavera b8e840db43 Make the commit configuration to be a typed struct rather than accepting a string. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 2ec468e2844365f0d7e2afd744f322cde25c077e
Component: engine
 2015-12-09 12:06:58 -05:00
David Calavera cb6bc1b323 Implement all inspect commands with the new inspector interface. 
It makes the behavior completely consistent across commands.
It adds tests to check that execution stops when an element is not
found.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 57b6796304880331d0d4e9cbefab7b139e718915
Component: engine
 2015-12-09 12:05:01 -05:00