microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
10 311 коммитов 243 Ветки 83 Теги 222 MiB
Граф коммитов

10311 Коммитов

Автор SHA1 Сообщение Дата
unclejack 1858746978 clean up context on build completion & add test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-02 17:35:25 +03:00
Alexandr Morozov 5f6b420f91 Merge pull request #7833 from crosbymichael/mem-test 
Add more error info to TestDockerRunEchoStdoutWithMemoryLimit
 2014-09-02 07:51:04 +04:00
Michael Crosby c0a5ec75c5 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>
 2014-09-01 17:09:52 -07:00
Victor Vieux 0704010313 Merge pull request #7832 from crosbymichael/fix-nat-test 
Make nat test less racy and accurate
 2014-09-01 16:57:26 -07:00
Michael Crosby 72652c5973 Make nat test less racy and accurate 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 16:54:32 -07:00
Michael Crosby ca63cceae5 Merge pull request #7830 from crosbymichael/update-libcontainer-sep1 
Update libcontainer to version 55430d0db7c6bb1198c0bb573a9700a859d5ec26
 2014-09-01 16:13:38 -07:00
Victor Vieux 40cc889a7c Merge pull request #7780 from unclejack/disallow_dns_with_net_host 
disallow net=host and net=container with links and dns
 2014-09-01 15:32:08 -07:00
Michael Crosby 688741df31 Update mount struct with reference 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 15:18:30 -07:00
Michael Crosby cf31787cd0 Update libcontainer to 55430d0db7c6bb1198c0bb573a9 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 15:18:25 -07:00
Michael Crosby 7ff488e741 Merge pull request #7829 from crosbymichael/process-config 
Refactor exec drivers for multi process
 2014-09-01 14:41:24 -07:00
Vishnu Kannan 3a7e07355a Rename 'StdConfig' to 'StreamConfig'. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-01 14:31:01 -07:00
Vishnu Kannan 4aa5da278f 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)
 2014-09-01 14:30:16 -07:00
James Turnbull 9ffb0f76f2 Merge pull request #7819 from SvenDowideit/debian-wheezy-notes 
Debian wheezy notes - minor md tweaks
 2014-09-01 15:45:47 -04:00
Michael Crosby efc6c9ba2f Merge pull request #7825 from LK4D4/move_integration_to_cli 
Move integration to cli
 2014-09-01 11:38:57 -07:00
Michael Crosby 388ed88042 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
 2014-09-01 11:31:38 -07:00
Michael Crosby ec87846908 Merge pull request #7809 from LK4D4/use_increment 
Use increment operator
 2014-09-01 11:16:25 -07:00
Michael Crosby ac69b661ee Merge pull request #7791 from SvenDowideit/mflag-Visit-returns-nil-flag 
fs.Visit() returns nil flag
 2014-09-01 11:13:32 -07:00
Victor Vieux 09d3670907 Merge pull request #7814 from erikh/fix_parser_env 
Fix panic when `ENV ARG=ARG` is used.
 2014-09-01 11:03:21 -07:00
Alexandr Morozov 195cee9983
Move TestRunCidFileCheckIDLength to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-01 20:15:20 +04:00
Alexandr Morozov 8892320835
Move TestRunCidFileCleanupIfEmpty to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-01 19:55:39 +04:00
Sven Dowideit 2aaa8892e3 Merge pull request #7820 from SvenDowideit/eik3-exit-doc-patch 
alternative to `exit` command: `CTRL-D`
 2014-08-31 20:39:23 -07:00
Eike Herzbach c0c525b3d1 alternative to `exit` command: `CTRL-D` 
Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net> (github: eik3)
 2014-09-01 13:38:25 +10:00
Sven Dowideit 2852037018 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)
 2014-09-01 09:55:53 +10:00
Vishal Doshi d27f1bb000 Update debian.md 
Add some instructions for Debian 7 (aka Wheezy/Stable)

Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com>
 2014-09-01 00:50:49 +05:30
James Turnbull 014471ad39 Merge pull request #7751 from dchen1107/master 
Bump containervm version to the latest one: 20140826
 2014-08-31 14:16:22 -04:00
James Turnbull a25594c867 Merge pull request #7805 from nzwsch/patch-1 
Update nodejs_web_app.md
 2014-08-31 14:14:40 -04:00
Alexandr Morozov c8999dc326 Merge pull request #7817 from cnf/fix_cli_top_test_priv 
Fixed error check using the wrong error value
 2014-08-31 19:24:33 +04:00
Frank Rosquin d93c95a332 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>
 2014-08-31 16:35:38 +02:00
Alexandr Morozov d301146c4b Merge pull request #7816 from cnf/fix_cli_top_test 
fixed error check using the wrong error value
 2014-08-31 18:28:29 +04:00
Frank Rosquin 82c536aacd 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>
 2014-08-31 16:21:53 +02:00
Erik Hollensbe d7dd35bbd6 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)
 2014-08-31 05:53:05 -07:00
Erik Hollensbe a0255ba502 Fix panic when `ENV ARG=ARG` is used. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-31 05:39:36 -07:00
Erik Hollensbe 394a6d3154 docker top: fix command when multiple arguments are supplied 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-31 01:18:15 -07:00
Alexandr Morozov 16e850fe3e
Use increment operator 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-30 21:43:48 +04:00
nzwsch 2d1ec162be Update nodejs_web_app.md 2014-08-30 16:02:47 +09:00
Victor Vieux 280b64bc7b Merge pull request #7775 from LK4D4/merge_state_lock 
Merge Container and State mutexes
 2014-08-29 11:25:21 -07:00
Michael Crosby 8b74ac6717 Merge pull request #7795 from LK4D4/style_fixes 
Some more style fixes
 2014-08-29 10:59:37 -07:00
Victor Vieux 9c0b851e4c Merge pull request #6628 from SvenDowideit/6501-list-all-docker-ports 
List all ports when calling `docker port container`
 2014-08-29 10:57:20 -07:00
Alexandr Morozov 114838cbda
Some more style fixes 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-29 15:21:28 +04:00
Alexandr Morozov 517ba44e37
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>
 2014-08-29 12:56:04 +04:00
SvenDowideit 4e340cedec List all ports when calling `docker port container` 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-29 18:31:51 +10:00
Sven Dowideit f1934e5979 fs.Visit() returns nil flag 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-08-29 15:38:03 +10:00
Victor Vieux 6eaac7d571 Merge pull request #5518 from vbatts/vbatts-save_many 
docker save: ability to save multiple images
 2014-08-28 18:40:28 -07:00
Vincent Batts 79501dcd4f save many: adding an integration-cli test 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-08-28 21:33:13 -04:00
James Turnbull f1a42fb609 Merge pull request #7789 from SvenDowideit/add-css-for-strong-tag 
Give the <strong> tag some CSS (the .content-body resets it)
 2014-08-28 18:12:54 -07:00
Fred Lifton d420b2cce0 Merge pull request #7786 from psftw/volume_removal 
Be more explicit about volume lifecycle
 2014-08-28 18:11:28 -07:00
SvenDowideit 7de977368c 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)
 2014-08-29 11:08:56 +10:00
Sven Dowideit 2bf41be514 Merge pull request #7769 from fredlf/1.2.0_release-notes 
Adding release notes to docs home
 2014-08-28 17:37:15 -07:00
Fred Lifton 810c231b91 Fixed typos based on feedback. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-08-28 17:29:09 -07:00
Vincent Batts e64131d1bf 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)
 2014-08-28 20:22:33 -04:00