toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,309 Commits 3 Branches 295 Tags
ef9df7ad175fa73f19520f9e14db6d9c616e0871
Commit Graph
10309 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby ef9df7ad17 Add more error info to TestDockerRunEchoStdoutWithMemoryLimit 
This test fails on my CI server often so we need more info when it does
happen with this test.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c0a5ec75c5a8f2d3ccb2f0c1a90f30bb20cdd60b
Component: engine
 2014-09-01 17:09:52 -07:00
Victor Vieux 31e72dbddc Merge pull request #7832 from crosbymichael/fix-nat-test 
Make nat test less racy and accurate
Upstream-commit: 07040103132d34a92023260ed74092e46190ab81
Component: engine
 2014-09-01 16:57:26 -07:00
Michael Crosby 5f3cf0d988 Make nat test less racy and accurate 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 72652c597385980c1bf6adebe4cded760dbf2663
Component: engine
 2014-09-01 16:54:32 -07:00
Michael Crosby 2354bba277 Merge pull request #7830 from crosbymichael/update-libcontainer-sep1 
Update libcontainer to version 55430d0db7c6bb1198c0bb573a9700a859d5ec26
Upstream-commit: ca63cceae5bb8420c2af866e1fa83e84e7770eeb
Component: engine
 2014-09-01 16:13:38 -07:00
Victor Vieux e6e2dac447 Merge pull request #7780 from unclejack/disallow_dns_with_net_host 
disallow net=host and net=container with links and dns
Upstream-commit: 40cc889a7c1739d1bf9bc49e968fbb754a6b7a92
Component: engine
 2014-09-01 15:32:08 -07:00
Michael Crosby 0886b9cbe5 Update mount struct with reference 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 688741df31396ece5f72cbc5ecc0250b3d06a8bc
Component: engine
 2014-09-01 15:18:30 -07:00
Michael Crosby 3d48a27630 Update libcontainer to 55430d0db7c6bb1198c0bb573a9 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cf31787cd0559012c1ee581eaf27143af1cc6ce3
Component: engine
 2014-09-01 15:18:25 -07:00
Michael Crosby c54ffbd9ed Merge pull request #7829 from crosbymichael/process-config 
Refactor exec drivers for multi process
Upstream-commit: 7ff488e74183dd4a5b255bdfdd3bfd166ed427ba
Component: engine
 2014-09-01 14:41:24 -07:00
Vishnu Kannan 559392405c Rename 'StdConfig' to 'StreamConfig'. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 3a7e07355a1ad67f71ee4255e06526186fd48f7a
Component: engine
 2014-09-01 14:31:01 -07:00
Vishnu Kannan a7e2cb4124 Refactoring execdriver.Command and Container structs to support 'docker exec' and other 
similar features in the future.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 4aa5da278f49c889d43191f82ff42d3a95266d62
Component: engine
 2014-09-01 14:30:16 -07:00
James Turnbull a4859208cd Merge pull request #7819 from SvenDowideit/debian-wheezy-notes 
Debian wheezy notes - minor md tweaks
Upstream-commit: 9ffb0f76f2efa1b5a93f78dec8bcd256f3d99fd2
Component: engine
 2014-09-01 15:45:47 -04:00
Michael Crosby 06de394335 Merge pull request #7825 from LK4D4/move_integration_to_cli 
Move integration to cli
Upstream-commit: efc6c9ba2f51a6103a9c982ab15e508e28e64831
Component: engine
 2014-09-01 11:38:57 -07:00
Michael Crosby 94c61e97d5 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
Upstream-commit: 388ed88042b54b3e0fff7096c1749f2bfc2c7e40
Component: engine
 2014-09-01 11:31:38 -07:00
Michael Crosby ba45bffa03 Merge pull request #7809 from LK4D4/use_increment 
Use increment operator
Upstream-commit: ec87846908287fd87d628a4b74f26e96c9c5f9cc
Component: engine
 2014-09-01 11:16:25 -07:00
Michael Crosby db97aa6a31 Merge pull request #7791 from SvenDowideit/mflag-Visit-returns-nil-flag 
fs.Visit() returns nil flag
Upstream-commit: ac69b661eed2fe410bd4275951e31c6f93e274d3
Component: engine
 2014-09-01 11:13:32 -07:00
Victor Vieux ca3fe8ca1e Merge pull request #7814 from erikh/fix_parser_env 
Fix panic when `ENV ARG=ARG` is used.
Upstream-commit: 09d36709076ac56387a12a7465b6a236e1253ff5
Component: engine
 2014-09-01 11:03:21 -07:00
Alexandr Morozov 4f814a8405 Move TestRunCidFileCheckIDLength to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 195cee99839a77afec7aaf7fe43cb5a9ceae4f57
Component: engine
 2014-09-01 20:15:20 +04:00
Alexandr Morozov 797834a228 Move TestRunCidFileCleanupIfEmpty to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 8892320835ad2b21b0efd4848d2af0d8a791a8e9
Component: engine
 2014-09-01 19:55:39 +04:00
Sven Dowideit ec0e80ec0b Merge pull request #7820 from SvenDowideit/eik3-exit-doc-patch 
alternative to `exit` command: `CTRL-D`
Upstream-commit: 2aaa8892e3d126e20f2659e9b71a9ce9973cf60f
Component: engine
 2014-08-31 20:39:23 -07:00
Eike Herzbach c3ac4898d5 alternative to exit command: CTRL-D 
Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net> (github: eik3)
Upstream-commit: c0c525b3d1a527738c1d942efd70e810908c0eac
Component: engine
 2014-09-01 13:38:25 +10:00
Sven Dowideit 8c659df878 Try to go for 80-char lines and a little md wrangling. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 2852037018e435dc61a27725a307595a6f57da40
Component: engine
 2014-09-01 09:55:53 +10:00
Vishal Doshi 533c5e1fed Update debian.md 
Add some instructions for Debian 7 (aka Wheezy/Stable)

Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com>
Upstream-commit: d27f1bb00006fc936c0cb393c93131427e68fef6
Component: engine
 2014-09-01 00:50:49 +05:30
James Turnbull 176595f966 Merge pull request #7751 from dchen1107/master 
Bump containervm version to the latest one: 20140826
Upstream-commit: 014471ad39b2f2a0ffbe4d943c2d0068dd3105e0
Component: engine
 2014-08-31 14:16:22 -04:00
James Turnbull ae6455c27b Merge pull request #7805 from nzwsch/patch-1 
Update nodejs_web_app.md
Upstream-commit: a25594c86713dea42b2b3649c0919225ce8f176f
Component: engine
 2014-08-31 14:14:40 -04:00
Alexandr Morozov 80ace0ef1f Merge pull request #7817 from cnf/fix_cli_top_test_priv 
Fixed error check using the wrong error value
Upstream-commit: c8999dc326c9d722386c88ba6cca219b8029452e
Component: engine
 2014-08-31 19:24:33 +04:00
Frank Rosquin f0aedfc820 Fixed error check using the wrong error value 
errorOut was using the err from the previous test.
same as #7816 but on TestTopPrivileged, which I missed last time

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
Upstream-commit: d93c95a332b65948cf37a87a84900323657571f0
Component: engine
 2014-08-31 16:35:38 +02:00
Alexandr Morozov 50d06f5bca Merge pull request #7816 from cnf/fix_cli_top_test 
fixed error check using the wrong error value
Upstream-commit: d301146c4b7b788f77b6ae77a574e75174a7f8d5
Component: engine
 2014-08-31 18:28:29 +04:00
Frank Rosquin 3a37023687 fixed error check using the wrong error value 
errorOut was using the err from the previous test.

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
Upstream-commit: 82c536aacd30baf110c074de1f83ae3ab2f9588c
Component: engine
 2014-08-31 16:21:53 +02:00
Erik Hollensbe e16ec47eeb Add a test for the multiple arguments passed to docker top 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: d7dd35bbd6250fcf42f8fe6521a55813e670f805
Component: engine
 2014-08-31 05:53:05 -07:00
Erik Hollensbe 3c324ec48a Fix panic when ENV ARG=ARG is used. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: a0255ba502d7a60a297aa67604eae75a9e1fbed3
Component: engine
 2014-08-31 05:39:36 -07:00
Erik Hollensbe c382a20d9b docker top: fix command when multiple arguments are supplied 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 394a6d3154fe810565ddc5619447c8a82e7ce38c
Component: engine
 2014-08-31 01:18:15 -07:00
Alexandr Morozov fe6985381c Use increment operator 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 16e850fe3ea42f5103c9a11f3db17d11dc4f6ada
Component: engine
 2014-08-30 21:43:48 +04:00
nzwsch 9fba71437d Update nodejs_web_app.md 
Upstream-commit: 2d1ec162be15d6d1107d4775d75744c9d23f8478
Component: engine
 2014-08-30 16:02:47 +09:00
Victor Vieux 7ffe4a077d Merge pull request #7775 from LK4D4/merge_state_lock 
Merge Container and State mutexes
Upstream-commit: 280b64bc7baf3cff48eb2f07330d693eebfaaee7
Component: engine
 2014-08-29 11:25:21 -07:00
Michael Crosby 446314ea70 Merge pull request #7795 from LK4D4/style_fixes 
Some more style fixes
Upstream-commit: 8b74ac67176090908bc1f9f713bd41f926b42862
Component: engine
 2014-08-29 10:59:37 -07:00
Victor Vieux 0c92dc62dd Merge pull request #6628 from SvenDowideit/6501-list-all-docker-ports 
List all ports when calling `docker port container`
Upstream-commit: 9c0b851e4cf45968af5ac67c3fa04fd250606cb5
Component: engine
 2014-08-29 10:57:20 -07:00
Alexandr Morozov cc2787ae0d Some more style fixes 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 114838cbda38f4808d3a7a0d40b33d2ee445d158
Component: engine
 2014-08-29 15:21:28 +04:00
Alexandr Morozov 76ca127323 Merge Container and State mutexes 
Resolved all deadlocks and fixed race between kill and
monitor.resetContainer
Fixes #7600

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 517ba44e3742c39c4c3fc249b8c40e9b7ddd845f
Component: engine
 2014-08-29 12:56:04 +04:00
SvenDowideit 6c5eee34ef List all ports when calling docker port container 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 4e340cedeccabcae8875dd35f8c984246d6c3bc1
Component: engine
 2014-08-29 18:31:51 +10:00
Sven Dowideit 5867aa701f fs.Visit() returns nil flag 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: f1934e59790c9af6466075d3d050386627ad1a9a
Component: engine
 2014-08-29 15:38:03 +10:00
Victor Vieux e5a06cff90 Merge pull request #5518 from vbatts/vbatts-save_many 
docker save: ability to save multiple images
Upstream-commit: 6eaac7d5710016d9717cb79b48c1bfe5f3ac92af
Component: engine
 2014-08-28 18:40:28 -07:00
Vincent Batts 5583bba50b save many: adding an integration-cli test 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 79501dcd4f7a207067c234766ae4788007a1d91b
Component: engine
 2014-08-28 21:33:13 -04:00
James Turnbull e57774383c Merge pull request #7789 from SvenDowideit/add-css-for-strong-tag 
Give the <strong> tag some CSS (the .content-body resets it)
Upstream-commit: f1a42fb609202774a96e20de44f2837e7d23def8
Component: engine
 2014-08-28 18:12:54 -07:00
Fred Lifton ff9b902fe8 Merge pull request #7786 from psftw/volume_removal 
Be more explicit about volume lifecycle
Upstream-commit: d420b2cce0864c85377fa37810c6e2f1abd07350
Component: engine
 2014-08-28 18:11:28 -07:00
SvenDowideit dc54819eb5 Give the <strong> tag some CSS (the .content-body resets it) 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7de977368cf5d8290c76b7127246996e90932e13
Component: engine
 2014-08-29 11:08:56 +10:00
Sven Dowideit 74bea8e421 Merge pull request #7769 from fredlf/1.2.0_release-notes 
Adding release notes to docs home
Upstream-commit: 2bf41be514e54f951985ee70dafcfc0ae3e1acb5
Component: engine
 2014-08-28 17:37:15 -07:00
Fred Lifton b17a5fe632 Fixed typos based on feedback. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 810c231b912c0a12acb8eb82a3756276e47fa632
Component: engine
 2014-08-28 17:29:09 -07:00
Vincent Batts 4d890308d7 docker save: ability to save multiple images 
Now from a single invocation of `docker save`, you can specify multiple
images to include in the output tar, or even just multiple tags of a
particular image/repo.

```
> docker save -o bundle.tar busybox ubuntu:lucid ubuntu:saucy fedora:latest
> tar tf ./bundle.tar | wc -l
42
> tar xOf ./bundle.tar repositories
{"busybox":{"latest":"2d8e5b282c81244037eb15b2068e1c46319c1a42b80493acb128da24b2090739"},"fedora":{"latest":"58394af373423902a1b97f209a31e3777932d9321ef10e64feaaa7b4df609cf9"},"ubuntu":{"lucid":"9cc9ea5ea540116b89e41898dd30858107c1175260fb7ff50322b34704092232","saucy":"9f676bd305a43a931a8d98b13e5840ffbebcd908370765373315926024c7c35e"}}
```

Further, this fixes the bug where the `repositories` file is not created
when saving a specific tag of an image (e.g. ubuntu:latest)

document multi-image save and updated API docs

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: e64131d1bf7c79358d5ee7a1a98626730db3593b
Component: engine
 2014-08-28 20:22:33 -04:00
Sven Dowideit 7e95f54878 Merge pull request #7749 from hollietealok/master 
Doc: Resizing Boot2Docker Volume with VirtualBox
Upstream-commit: 31d2701377c6667ad099226fe25004345017fb5d
Component: engine
 2014-08-28 16:08:29 -07:00
Hollie Teal 3de067038b Final tweaks. 
Signed-off-by: Hollie Teal <hollie@docker.com>
Upstream-commit: 0f8d461ed7c8b338d671bea0240b288fa91155b6
Component: engine
 2014-08-28 13:51:38 -07:00