docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,169 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

1506 Commits

Author SHA1 Message Date
David Calavera 04c6f09fbd Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown 
Ensure all the running containers are killed on daemon shutdown
 2015-05-29 16:45:57 -07:00
David Calavera eaa9c1b97e Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all 
fix bug with rmi multiple tag
 2015-05-29 15:10:22 -07:00
David Calavera 4389fc8bf9 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
 2015-05-29 15:05:21 -07:00
Jessica Frazelle 185f392691 fix bug with rmi multiple tag 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 14:04:06 -07:00
Antonio Murdaca ec97f41465 Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:36 +02:00
Antonio Murdaca 15134a3320 Remove PortSpecs from Config 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:09 +02:00
David Calavera 4c9fd72a91 Merge pull request #13598 from calavera/fix_windows_build 
Do not require cgroups capabilities on windows to run the integration tests.
 2015-05-29 12:57:40 -07:00
David Calavera a914101296 Do not require cgroups capabilities on windows to run the integration tests. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-29 11:42:40 -07:00
Jessica Frazelle b372f9f224 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 10:00:22 -07:00
Jessica Frazelle 1392f99a97 skip test on lxc 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-28 14:54:12 -07:00
Eric Windisch e58161fedc Expand unshare test to include privileged test 
This ensures that AppArmor, not other mechanisms used
by Docker or the kernel is restricting the mount.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-05-28 16:49:48 -04:00
David Calavera 617a0c2fde Merge pull request #13428 from duglin/niceHelp2 
Nice help2
 2015-05-28 11:09:02 -07:00
Jessie Frazelle 5bb6262d88 Merge pull request #13529 from hqhq/hq_skip_cgroup_test 
Skip test if not have Cpu quota or Cpu period
 2015-05-28 10:57:32 -07:00
Qiang Huang 34e5b6af19 Skip test if not have Cpu quota or Cpu period 
Closes: #13522

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-28 14:59:58 +08:00
Dan Walsh 35a7f0c59e Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-05-27 16:37:32 -04:00
David Calavera 26650e2ccc Merge pull request #13483 from jfrazelle/lxc-we-meet-again 
fix lxc tests unshare, they dont use our apparmor profile
 2015-05-27 10:22:31 -07:00
Alexander Morozov 2029257e3c Merge pull request #13493 from jlhawn/volume_unmount_fix 
Fix container unmount networkMounts
 2015-05-27 08:44:11 -07:00
Phil Estes f3e56420a3 Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe 
Fix unregister stats on when rm running container
 2015-05-27 11:10:36 -04:00
Dan Walsh 66121d1b45 Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-05-27 11:00:12 -04:00
Antonio Murdaca 3f66f6f2f0 Merge pull request #13500 from HuKeping/cleanup 
Remove unused code
 2015-05-27 13:59:40 +02:00
Hu Keping a34cb32186 Remove unused code 
As far as I see, it's a dead code.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-27 22:39:02 +08:00
Brian Goff b3e8ab3021 Fix unregister stats on when rm running container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 22:22:03 -04:00
Lei Jitang bdb77078b5 Ensure all the running containers are killed on daemon shutdown 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 09:09:25 +08:00
Josh Hawn 04f99a6ca8 Fix container unmount networkMounts 
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-05-26 17:38:26 -07:00
Arnaud Porterie b50e780925 Merge pull request #13491 from jfrazelle/revert-exec-privileged 
Revert "Add docker exec run a command in privileged mode"
 2015-05-26 16:41:50 -07:00
Tibor Vass 54b514735c Merge pull request #12881 from nakedible/patch-1 
Prevent fallback to v1 registry for digest pulls
 2015-05-26 19:24:37 -04:00
Alexander Morozov de318d8c1d Merge pull request #13489 from cpuguy83/cleanup_rm_funcs 
Cleanup container rm funcs
 2015-05-26 14:24:02 -07:00
Jessica Frazelle 40b71adee3 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
 2015-05-26 14:12:16 -07:00
Arnaud Porterie 47e727d1fc Merge pull request #13440 from LK4D4/fix_bridge_none 
Fix network with -b none
 2015-05-26 14:08:21 -07:00
Brian Goff f8628ba891 Cleanup container rm funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 15:38:52 -04:00
Jessica Frazelle a08fb73f93 fix lxc tests unshare, they dont use our apparmor profile 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-26 10:31:21 -07:00
Sebastiaan van Stijn aee9ac302d Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test 
add unshare apparmor profile test
 2015-05-26 17:32:45 +02:00
Zhang Wei ab121345ee Cleanup: change test func name 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-25 14:51:10 +08:00
Alexander Morozov 3cb14df68c Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-24 08:26:59 -07:00
Arnaud Porterie bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Doug Davis 8324d7918b Carry #11858 
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-23 09:14:18 -07:00
Alexander Morozov 89582f9781 Merge pull request #13403 from hqhq/hq_fix_ipcmode_check 
Don't check running container at create time
 2015-05-23 08:32:51 -07:00
David Calavera d592778f4a Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-22 16:43:34 -07:00
Qiang Huang 84aae5a226 Don't check running container at create time 
We should let user create container even if the container he wants
join is not running, that check should be done at start time.

In this case, the running check is done by getIpcContainer() when
we start container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-23 07:15:14 +08:00
Jessica Frazelle a1ea562b20 lol 108 chars ETOOMANY 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-22 10:10:17 -07:00
Zhang Wei 6809fa6861 Delete "defer deleteAllContainers()" from integration-cli 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-22 17:01:52 +08:00
Arnaud Porterie 4fc37a1ede Mark --volume-driver as experimental 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 20:34:17 -07:00
David Calavera 81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Jessie Frazelle 2b8271399e Merge pull request #13386 from icecrime/experimental_suffix_version 
Suffix experimental version / fix warning output
 2015-05-21 17:42:23 -07:00
Qiang Huang c0dd8538db Fix test failure when --net none build 
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-22 08:21:09 +08:00
Arnaud Porterie 78578125ce Add suffix to experimental builds version 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 16:27:42 -07:00
Alexander Morozov 7fffcfff32 Merge pull request #13387 from cpuguy83/fix_ngroutine_test 
Better checking for LogsFollowGoroutinesWithStdout
 2015-05-21 12:31:57 -07:00
Brian Goff 2805ff1ece Better checking for LogsFollowGoroutinesWithStdout 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-21 14:13:01 -04:00
Doug Davis 012e588a74 Add a 'docker create' + 'docker rm' testcase 
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-21 07:30:51 -07:00
Lei Jitang d0de2b1e2f Make docker ps --size show virtual size really work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-21 08:57:11 +08:00
Antonio Murdaca 0fddb6ad7e Merge pull request #13263 from rajdeepd/dry-run-test-2 
TestCase for CpuShares and Cpuset
 2015-05-20 23:33:42 +02:00
Jessica Frazelle 6f75dd85c5 add unshare apparmor profile test 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-20 14:06:00 -07:00
Alexander Morozov dec13cef2a Merge pull request #13346 from mrjana/cnm_integ 
Fix network connectivity problem for non-root users
 2015-05-20 12:02:07 -07:00
Rajdeep Dua ebe344d34b TestCase for CpuShares and Cpuset 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
 2015-05-20 11:32:48 -07:00
Alexander Morozov 53a795378d Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan afd901e408 Fix network connectivity problem for non-root users 
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-20 17:51:20 +00:00
Alexander Morozov 7e5902c92d Test for two containers in --net=host 
This is test for regression which was encountered during libnetwork
merging.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-20 09:35:28 -07:00
Lorenzo Fontana 086b514f6a Removed deleteContainer calls 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-05-20 08:38:23 +02:00
Jessie Frazelle d29dc0b608 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
 2015-05-20 03:11:58 +02:00
Jana Radhakrishnan d18919e304 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:19 +00:00
Jessie Frazelle 92c869cd12 Merge pull request #12437 from fmzhen/remove-regex-replace 
Removal of the regex to replace ips
 2015-05-19 22:59:17 +02:00
Lorenzo Fontana a2787469ac Using dockerCmd when possible 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-05-19 20:33:59 +02:00
Doug Davis 7fcf849749 Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-19 11:21:05 -07:00
Alexander Morozov 3916561619 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-19 09:32:23 -07:00
Mingzhen Feng 3ab7ceb5d7 Removal of the regex to replace ips 
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
 2015-05-19 10:15:18 +08:00
Michael Crosby aac645ae04 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
 2015-05-18 13:06:21 -07:00
Brian Goff ccf02a9f77 Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
 2015-05-18 14:53:37 -04:00
Doug Davis 3b1f73fbcd Remove use of 'bash' from our tests 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-18 11:29:08 -07:00
Michael Crosby aca4ae8c90 Merge pull request #13280 from runcom/test-clean-from-inspect 
Clean tests from not needed inspect call
 2015-05-18 11:06:18 -07:00
Nuutti Kotivuori 642e6a3773 Prevent fallback to v1 registry for digest pulls 
The intention of the user is to download a verified image if explicitly
pulling with a digest and falling back to v1 registry circumvents that
protection.

Signed-off-by: Nuutti Kotivuori <naked@iki.fi>
 2015-05-18 08:26:26 +03:00
Qiang Huang 74f8a4eca4 Use inspectField to simplify code 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-18 10:06:13 +08:00
Lei Jitang 9a09664b51 Fix automatically publish ports without --publish-all 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-18 02:57:17 +08:00
Antonio Murdaca a268e36719 Clean tests from not needed inspect call 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-16 18:12:54 +02:00
Alexander Morozov b5e932a3bf Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
 2015-05-16 09:05:03 -07:00
Hu Keping 35b4ed4d17 Remove dead code of integration-cli/utils.go 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-16 16:49:55 +08:00
Ahmet Alp Balkan 1630ed97ac Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-15 20:21:59 +00:00
Alexander Morozov 0db7365c66 Merge pull request #13221 from duglin/ReenableDebug 
add link between -D and --log-level=debug back in
 2015-05-15 11:45:44 -07:00
Alexander Morozov 5d2ef30a38 Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check 
Extend sleep/timeout for ngoroutine check
 2015-05-15 08:57:25 -07:00
Brian Goff f207322c0a Extend sleep/timeout for ngoroutine check 
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.

Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-15 09:54:43 -04:00
David Calavera e4855eebf2 Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339 
Parse input timestamps with standard RFC3339
 2015-05-14 16:49:01 -07:00
Alexander Morozov b2ad9314a2 Merge pull request #13196 from crosbymichael/update-libocntainer-may13 
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
 2015-05-14 10:49:25 -07:00
Doug Davis a85ca8b7c4 add link between -D and --log-level=debug back in 
Due to popular demand :-)
See #11965

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 10:29:49 -07:00
Alexander Morozov fe6f77df2c Merge pull request #13087 from duglin/FixNatTest 
Fix random errors in DockerSuite.TestNetworkNat
 2015-05-14 08:35:27 -07:00
Brian Goff ac81cd1fc3 Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
 2015-05-14 10:36:50 -04:00
Doug Davis 3f4926e49b Fix a regression in `docker import` on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 06:56:52 -07:00
Ahmet Alp Balkan 999f464feb Parse input timestamps with standard RFC3339 
Fix for #13175.

This change allows user-input timestamps (e.g. to `docker events
--since/--until`  or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).

User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.

Added test case for `events --since/--until` with all possible
timestamp input formats.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-14 07:44:42 +00:00
Sebastiaan van Stijn ed25742002 Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
 2015-05-13 18:30:32 -07:00
Darren Shepherd f2e5207fc9 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-13 17:56:32 -07:00
Antonio Murdaca b37abf2528 Merge pull request #13146 from rajdeepd/dry-run-test-1 
Modified Test Case to include check for Memory and MemorySwap
 2015-05-14 01:10:35 +02:00
Alexander Morozov 64ea54c0ed Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot 
Minor typo: remove redundant dot in error message in runconfig/parse.go
 2015-05-13 15:24:01 -07:00
Michael Crosby 677d76cd4a Update test for /sys mounting 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-13 15:02:53 -07:00
Rajdeep Dua 1eea2c589d Modified Test Case to include check for Memory and MemorySwap 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
 2015-05-13 13:39:07 -07:00
David Calavera 3da0013ac4 Merge pull request #13155 from coolljt0725/fix_validate_tag_name 
Fix validate tag name. Fix #13149
 2015-05-13 12:03:22 -07:00
Alexander Morozov 1b678f86b3 Merge pull request #13174 from ahmetalpbalkan/TestLogsSince 
integ-cli: Fix race in TestLogsSince
 2015-05-13 11:35:17 -07:00
Jessie Frazelle ebe9a85486 Merge pull request #13183 from runcom/fix-typo-tests-grouping 
Fix typo to run tests grouped by RunUnprivileged
 2015-05-13 11:33:14 -07:00
Antonio Murdaca a36f6a140b Fix typo to run tests grouped by RunUnprivileged 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-13 14:24:54 +02:00
unclejack fdec5197f1 integcli: change Dettach to Detach 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-13 12:49:19 +03:00
Lei Jitang e00cfbb6f2 Fix invalid tag name 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-13 14:28:52 +08:00
Antonio Murdaca 56847ec4d4 Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
 2015-05-13 05:23:56 +02:00
Lei Jitang c6dad07b1b Minor typo: remove redundant dot in error message in runconfig/parse.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-13 11:04:07 +08:00