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

1520 Commits

Author SHA1 Message Date
Antonio Murdaca 74121a4211 Do not check and return strconv.Atoi error in api container restart, regression 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-07 01:49:16 +02:00
Alexander Morozov 4b4adae41c Merge pull request #13033 from icecrime/12715_carry 
Logs with follow=1 immediately send HTTP response
 2015-05-06 15:42:48 -07:00
Anthony Baire 589de35651 Logs with follow=1 immediately send HTTP response 
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-06 14:39:45 -07:00
Jessie Frazelle 10f4bf514d Merge pull request #12878 from cpuguy83/move_chunked_encoding_test_to_from_integration 
Move ChunkedEncoding from integration
 2015-05-06 13:59:13 -07:00
Brian Goff f9b20ad9e4 Merge pull request #12999 from duglin/BadRUNerrMsg 
Fix RUN's error msg when it fails
 2015-05-06 15:49:24 -04:00
Alexander Morozov 71c1a7ea7f Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes 
Fix LXC stop signals
 2015-05-06 11:21:44 -07:00
Brian Goff 7c574b9e9d Move ChunkedEncoding from integration 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-06 13:00:17 -04:00
Brian Goff d2c4ee37c6 Fix LXC stop signals 
`lxc-stop` does not support sending arbitrary signals.
By default, `lxc-stop -n <id>` would send `SIGPWR`.
The lxc driver was always sending `lxc-stop -n <id> -k`, which always
sends `SIGKILL`. In this case `lxc-start` returns an exit code of `0`,
regardless of what the container actually exited with.
Because of this we must send signals directly to the process when we
can.

Also need to set quiet mode on `lxc-start` otherwise it reports an error
on `stderr` when the container exits cleanly (ie, we didn't SIGKILL it),
this error is picked up in the container logs... and isn't really an
error.

Also cleaned up some potential races for waitblocked test.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-06 11:56:48 -04:00
Doug Davis 54662eae10 Fix RUN's error msg when it fails 
When RUN returns with a non-zero return code it prints the command
that was executed as a Go []string:
```
INFO[0000] The command &{[/bin/sh -c noop a1 a2]} returned a non-zero code: 127
```

instead it should look like this:
```
INFO[0000] The command "/bin/sh -c noop a1 a2" returned a non-zero code: 127
```

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-05 16:08:41 -07:00
Doug Davis 08b7f30fcd Fix issue where build steps are duplicated in the output 
This fixes an issue where the build output for the "Steps" would look like:
```
Step 1: RUN echo hi echo hi
```
instead of
```
Step 1: RUN echo hi
```

Also, I noticed that there were no checks to make sure invalid Dockerfile
cmd flags were caught on cmds that didn't use cmd flags at all. They would
have been caught on the cmds that had flags, but cmds that didn't bother
to add a new code for flags would have just ignored them.  So, I added
checks to each cmd to flag it.

Added testcases for issues.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-05 15:28:42 -07:00
Arnaud Porterie e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Alexander Morozov 77266a67e0 Merge pull request #12947 from runcom/11577-readonly-special-file-if-readonlyfs 
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only enabled
 2015-05-05 09:45:24 -07:00
Lei Jitang 0e08e9aca1 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-05 19:28:40 +08:00
Qiang Huang 5a6db4fd44 a few cleanups for client output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-05 15:59:17 +08:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Yuan Sun 6e8aa4e588 Verify the no-trunc option for the search operation. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-05-05 08:51:13 +08:00
Arnaud Porterie 44de5fecce Add DOCKER_USERLANDPROXY test variable 
Add an convenient way to switch --userland-proxy on and off in
integration tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-04 16:07:51 -07:00
Arnaud Porterie f42348e18f Add `--userland-proxy` daemon flag 
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-04 16:07:45 -07:00
Antonio Murdaca 8771cafab6 Add tests for API container delete 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 22:41:57 +02:00
David Calavera 0a2ccb1cb5 Merge pull request #12769 from calavera/git_build_fragment 
Use git url fragment to specify build reference and dir context.
 2015-05-04 12:48:24 -07:00
mauriyouth 7d371c0b47 Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 21:30:52 +02:00
Phil Estes 24bd3db0b5 Merge pull request #12939 from draghuram/history_test 
Adding test for "GET /images/(name)/history" API.
 2015-05-04 12:58:43 -04:00
David Calavera 49fd83a25e Use git url fragment to specify reference and dir context. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-04 09:28:06 -07:00
Brian Goff f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04:00
Yuan Sun 9eefd2c17d Verifiy status Codes 404 when no such image 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-05-04 15:39:40 +08:00
Raghuram Devarakonda aaaa8bab0c Adding test for "GET /images/(name)/history" API. 
Closes #12284.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-02 23:09:32 -04:00
Tianon Gravi 576985a1dc Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum! 
IT'S ABOUT TIME. 🎉

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-01 16:01:10 -06:00
Jessie Frazelle 1f2f3db1e3 Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit 
TestDiffEnsureDockerinitFilesAreIgnored is too long
 2015-05-01 14:52:34 -07:00
Antonio Murdaca 5c86f311c8 Fix TestApiImagesDelete for --net none build 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 20:49:28 +02:00
Tibor Vass 0d0b42547e Merge pull request #12771 from runcom/say-bye-to-engine 
Remove engine
 2015-04-30 12:18:16 -04:00
Brian Goff 1eb4e96f21 Merge pull request #12837 from mavenugo/integ 
A few more Integration tests to test Networking related daemon flags
 2015-04-30 11:12:43 -04:00
Daniel, Dao Quang Minh cd2b019214 sort ports mapping before allocating 
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-30 02:18:04 +00:00
Antonio Murdaca f7e417ea5e Remove integration tests and port them to integration-cli 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Dan Walsh d0a4f310ef 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-04-29 15:06:47 -04:00
Madhu Venugopal 1c073ec176 Moved explicit cleanups into defered action 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 11:41:13 -07:00
Madhu Venugopal dd0666e64f Integration Tests for --icc=false & container Linking using --expose 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 10:16:31 -07:00
Madhu Venugopal ba11929ebd Integration tests for --ip daemon option 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:49 -07:00
Madhu Venugopal 0e254411b1 Integration tests for --fixed-cidr daemon config 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:42 -07:00
Madhu Venugopal 9c325c3f54 Integration tests for --bip daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:34 -07:00
Madhu Venugopal f3f5ff9d83 Integration tests for --bridge daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:25 -07:00
Antonio Murdaca 4203230cbb c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-29 17:02:22 +02:00
Doug Davis 534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
Jessie Frazelle f80300e9cf Merge pull request #12789 from LK4D4/daemon_suite 
Implement daemon suite for integration-cli
 2015-04-28 15:30:36 -07:00
David Calavera cfa3a080c6 Merge pull request #12820 from runcom/yet-another-sockRequest-refactor 
Expose whole Response struct in sockRequestRaw
 2015-04-28 13:26:30 -07:00
buddhamagnet 6fd8e485c8 add support for exclusion rules in dockerignore 
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
 2015-04-28 18:56:45 +01:00
Doug Davis 82daa43844 Fix for Daemon crashing when wildcards are used for COPY/ADD 
in the filename and the command itself

Closes #12267

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-27 19:09:57 -07:00
Alexander Morozov 57464c32b9 Implement daemon suite for integration-cli 
For creating and stopping test daemons automatically.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-27 15:48:29 -07:00
Phil Estes 0153edcda1 Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
 2015-04-27 17:05:46 -04:00
Tibor Vass 62a85fe202 Merge pull request #12794 from runcom/small-cleaning 
Small if err cleaning
 2015-04-27 17:02:27 -04:00
David Mackey 3941623fbc trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
 2015-04-27 13:35:08 -07:00
Daniel Antlinger 50868b2c57 fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
 2015-04-27 13:24:15 -07:00
Antonio Murdaca 844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
Lorenzo Fontana 40779b28bb Parallelize TestEventsLimit 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-04-27 21:14:00 +02:00
Antonio Murdaca bb1c576eb3 Expose whole Response struct in sockRequestRaw 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 18:49:00 +02:00
Alexander Morozov 5305e675b5 Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws 
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
 2015-04-27 08:59:47 -07:00
Alexander Morozov 02d73d910f Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock 
Prevent deadlock on --net=container:<self>
 2015-04-27 08:46:22 -07:00
Brian Goff 8dc07af52f Merge pull request #12783 from duglin/Issue12763-LinkedEnvs 
A fix for = in env values in linked containers
 2015-04-27 10:50:14 -04:00
Doug Davis 325c0404c8 Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps 
remove some uneeded sleeps in tests
 2015-04-27 10:42:40 -04:00
Brian Goff 9e0ffae864 remove some uneeded sleeps in tests 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-27 10:14:29 -04:00
Aidan Hobson Sayers f30d1c1835 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-04-27 14:57:37 +01:00
Antonio Murdaca c7b2632dc8 Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 13:56:55 +02:00
Alexander Morozov fefb836766 Merge pull request #12728 from HuKeping/addtest 
Add test for REST API container rename
 2015-04-25 17:01:10 -07:00
Nathan LeClaire 9dbe12b792 Migrate integration test to new method 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-25 17:12:01 -04:00
Nathan LeClaire 65aba0c9d6 Add dep to test 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-25 15:25:52 -04:00
Nathan LeClaire f039c699a4 Fix gofmt 
Mischevious comma is mischevious

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-25 15:25:52 -04:00
Marianna f40dd69c97 Add test for cgroup parent flag for build 
Signed-off-by: Marianna <mtesselh@gmail.com>
 2015-04-25 15:25:52 -04:00
Doug Davis cd4f507b42 Fix race condition in API commit test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-25 05:46:47 -07:00
Doug Davis bc149be69c A fix for = in env values in linked containers 
Closes: #12763

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-25 04:42:43 -07:00
Hu Keping 8f752ffeaf Add test for REST API container rename 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-25 17:19:57 +08:00
Phil Estes 6e9a6f5396 Merge pull request #12765 from LK4D4/registry_suite 
Implement DockerRegistrySuite in integration-cli
 2015-04-24 23:05:29 -04:00
Alexander Morozov f696b1071a Implement DockerRegistrySuite in integration-cli 
To avoid manually creating and destroying registrys in tests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 14:17:00 -07:00
Alexander Morozov 9bea123bdd Not protect dangling images for integration-cli 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 13:16:51 -07:00
Brian Goff b76bbae413 Merge pull request #12755 from LK4D4/use_f_for_remove 
Use -f for rm instead of kill before
 2015-04-24 15:34:38 -04:00
Alexander Morozov 887ad57cfa Use -f for rm instead of kill before 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 11:55:54 -07:00
Brian Goff 03719be830 Merge pull request #12754 from LK4D4/carry_12707 
fix runtime issue for TestEventsFilterContainer
 2015-04-24 14:36:58 -04:00
Daniel Antlinger 07795c3f5d fix runtime issue for TestEventsFilterContainer 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:48:40 -07:00
Alexander Morozov a9688cdca5 Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:37:21 -07:00
Regan McCooey c92377e300 docker kill should return error if container is not running. 
Assuming that docker kill is trying to actually kill the container
is a mistake.  If the container is not running we should report it
back to the caller as a error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com> (github: rmccooey27)

Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com> (github: rhatdan)
 2015-04-24 08:33:21 -04:00
Lei Jitang 5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Jessie Frazelle 9d94d91ea7 Merge pull request #12569 from kostickm/12449-check-statusCode 
Fixing statusCode checks for sockRequest
 2015-04-23 17:13:06 -07:00
Michael Crosby c26695cf8a Merge pull request #12659 from dqminh/exec-interactive-hang 
reuse same code for setting pipes in run/exec
 2015-04-23 16:37:49 -07:00
Megan Kostick c7845e27ee Fixing statusCode checks for sockRequest 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-23 15:35:56 -07:00
Daniel, Dao Quang Minh ade8146aa8 reuse same code for setting pipes in run/exec 
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-23 21:54:21 +00:00
Alexander Morozov 96ef1bd29c Merge pull request #12709 from vdemeester/12705-remove-defer-deleteContainer 
delete "defer deleteContainer" on tests
 2015-04-23 14:34:23 -07:00
Jessie Frazelle b31d154294 Merge pull request #12509 from runcom/12499-racy-TestEventsImageImport 
Fix TestEventsImageImport racy
 2015-04-23 13:28:43 -07:00
Vincent Demeester c5ef2901d8 delete "defer deleteContainer" on tests 
Since docker test suite is now using gocheck, ``defer
deleteContainer(…)`` is not needed anymore.

Fixes #12705

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-04-23 22:27:46 +02:00
Jessie Frazelle 59ae92d55c Merge pull request #12575 from brahmaroutu/integration_test7_12255 
Move https tests as unit tests under client
 2015-04-23 13:17:54 -07:00
Jessie Frazelle 68fc79f592 Merge pull request #12655 from jlhawn/fix_12281 
Validate repo name before image pull
 2015-04-23 13:12:12 -07:00
Alexander Morozov 799cf056e7 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
 2015-04-23 13:07:40 -07:00
Jessie Frazelle 036ade6c05 Merge pull request #12693 from runcom/fix-TestRenameStoppedContainer-race 
Fix TestRenameStoppedContainer race
 2015-04-23 13:04:36 -07:00
Josh Hawn 18f4688385 Validate repo name before image pull 
Checks for reserved 'scratch' image name.

fixes #12281

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-04-23 11:44:46 -07:00
Jessie Frazelle 03e77e5c8f Merge pull request #12690 from rajdeepd/dry-run-test 
Container API Test with HostName
 2015-04-23 11:32:47 -07:00
Jessie Frazelle 59acccb6f2 Merge pull request #12692 from cpuguy83/fix_commit_test 
Fix race with TestContainerApiCommit
 2015-04-23 11:31:27 -07:00
Srini Brahmaroutu 231d362db7 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 18:25:18 +00:00
Alexander Morozov d17f2baa81 Merge pull request #12646 from duglin/validateTests 
Validate we're not using the old testing stuff
 2015-04-23 11:23:20 -07:00
Doug Davis ecccfa82aa Validate we're not using the old testing stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-23 10:29:47 -07:00
Srini Brahmaroutu 05013f1250 Move https integration tests as unit tests under client 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 15:40:46 +00:00
Antonio Murdaca ee7a7b07e7 Remove deleteAllContainers call in test 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 16:32:50 +02:00
Antonio Murdaca cd6cc45d52 Fix TestRenameStoppedContainer race 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 16:11:46 +02:00
Rajdeep Dua fca4aea077 TestCase added for Container Create with HostName 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
 2015-04-23 06:53:34 -07:00
Brian Goff 563708d78d Fix race with TestContainerApiCommit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-23 09:45:06 -04:00
Doug Davis f4cfaac519 Merge pull request #12680 from Mashimiao/fix-typo-push-test 
push test: fix typo
 2015-04-23 07:37:50 -04:00
Ma Shimiao 62f91b1d34 push test: fix typo 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-23 16:50:41 +08:00
Doug Davis eae272f90e Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
 2015-04-22 23:06:13 -04:00
Brian Goff 6bacb4528e Merge pull request #12582 from ankushagarwal/add-docker-history-integration-test 
Add integration test for history option
 2015-04-22 22:09:01 -04:00
Qiang Huang b0ef3194aa fix inspect format result 
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-23 09:28:07 +08:00
Brian Goff 480d979c27 Merge pull request #12654 from jfrazelle/12135-docker-delete-multiple-tagged 
add regression test for rmi multiple tags without f
 2015-04-22 21:08:07 -04:00
Brian Goff 3872272170 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
 2015-04-22 21:05:15 -04:00
Doug Davis 5ea8dc376c Merge pull request #12649 from jlhawn/fix_pull_err_explosion 
Correctly format API error on image pull
 2015-04-22 20:28:24 -04:00
Brian Goff f3680e7494 Cleanup daemon/volumes 
- Mount struct now called volumeMount
- Merged volume creation for each volume type (volumes-from, binds, normal
  volumes) so this only happens in once place
- Simplified container copy of volumes (for when `docker cp` is a
  volume)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-22 19:32:10 -04:00
Antonio Murdaca 4b9fe9c298 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 00:58:13 +02:00
Jessica Frazelle 28f5541b72 add regression test for rmi multiple tags without f 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-22 14:23:05 -07:00
Jessica Frazelle 7a525c6cb7 add integration test for error pull nonexistent 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-22 14:11:25 -07:00
Alexander Morozov 29265448ec Merge pull request #12621 from LK4D4/test_push_interrupt_daemon 
Run TestPushInterrupt on separate daemon
 2015-04-22 14:05:37 -07:00
Alexander Morozov c09765ac43 Wait until all pushes are done in TestPushInterrupt 
Background pushes affects other tests

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-22 13:36:43 -07:00
Ankush Agarwal 08150150bb Add integration test for history option 
Parse the history output to locate the size fields and check
whether they are the correct format or not. Use Column name SIZE
to mark start and end indices of the size fields

Fixes #12578

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-22 12:22:01 -07:00
Doug Davis b4988d8d75 Remove old testing stuff that slipped into master 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-22 11:44:54 -07:00
Antonio Murdaca eeb8ceb9ed Fix TestEventsImageImport racy, fixes #12499 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-22 17:30:30 +02:00
Alexander Morozov dc944ea7e4 Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 10:28:52 -07:00
Jessie Frazelle 17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle 874d64e690 Merge pull request #12517 from mavenugo/master 
Enhanced port integration-cli tests
 2015-04-20 17:26:48 -07:00
Phil Estes 435643545c Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
 2015-04-20 17:27:17 -04:00
Alexander Morozov 08ef006d17 Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
 2015-04-20 13:12:17 -07:00
Doug Davis 18c9b6c645 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-20 13:05:24 -07:00
Alexander Morozov cfe7c9c1b2 Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network 
Add missing testRequires(t, Network)
 2015-04-20 12:58:30 -07:00
Sergey Evstifeev 716e21be2b Add missing testRequires(t, Network) 
Fixes #12552

Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
 2015-04-20 21:19:50 +02:00
Phil Estes 53edce79f1 Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction 
12553 fix typo
 2015-04-20 14:30:51 -04:00
Srini Brahmaroutu 1a35b16b08 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-20 17:57:53 +00:00
buddhamagnet cdd5d5e4c3 fix typo 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
 2015-04-20 18:56:21 +01:00
Lei Jitang dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Alexander Morozov 181fea24aa Make daemon initialization in main goroutine 
It is simplifies code and lead to next refactoring step, where daemon
will be incorporated to some structure which represents API.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-20 08:13:39 -07:00
Hu Keping f4942ed864 Remove Job from Info API 
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-20 18:14:06 +08:00
Madhu Venugopal 448a1a7139 Enhanced port integration-cli tests 
THe port tests in integration-cli tests just for the port-mapping as
seen by Docker daemon. But it doesn't perform a more indepth testing by
checking for the exposed port on the host.

This change helps to fill that gap.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-19 06:15:23 -07:00
Arnaud Porterie 5fd378c0d1 Merge pull request #12466 from robertabbott/fix_dockerCmd 
Removed unnecessary error output from dockerCmd
 2015-04-17 15:15:34 -07:00
Brian Goff 055c6dbaef Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
 2015-04-17 15:26:30 -04:00
Simei He 6e38a53f96 remove job from pull and import 
Closes #12396

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-17 09:55:02 -07:00
bobby abbott 621b601b3c Removed unnecessary error output from dockerCmd 
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.

resolves #12355

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-04-17 09:11:14 -07:00
Antonio Murdaca a0bf80fe03 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-17 14:27:38 +02:00
Doug Davis 5e40de9286 Merge pull request #12468 from icecrime/disable_test_pull_verified 
Skip TestPullVerified
 2015-04-17 02:31:01 -04:00
Arnaud Porterie 9a4fa9c191 Skip TestPullVerified 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 23:05:47 -07:00
Doug Davis 5207b3eb2b Merge pull request #12446 from icecrime/please_go_away_testexp.tar 
Always remove testexp.tar test file
 2015-04-17 01:58:29 -04:00
Arnaud Porterie 4e356ee410 Improve export/import tests cleanup 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 22:10:55 -07:00
Brian Goff 308a23021d Move TestPostCreateNull to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:49:46 -04:00
Brian Goff 5dc02a2fa8 Move TestPostJsonVerify to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:49:28 -04:00
Brian Goff 23fa7d41d5 Move TestContainerApiCreate to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:49:10 -04:00
Brian Goff f19061ccfd Move TestPostCommit to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:48:54 -04:00
Brian Goff d9e4b14346 Move TestGetContainersTop to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:48:33 -04:00
Brian Goff 6f5b895bc7 Move SaveAndThenload to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:40:49 -04:00
Brian Goff 8232cc777e Make sockRequestRaw return reader, not []byte 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:40:49 -04:00
Qiang Huang f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08:00
Qiang Huang 8077b2fb80 add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:33:46 +08:00
Thomas Texier 2ea1febd9a Remove unnecessary fmt.Printf 
Signed-off-by: Thomas Texier <sharkone@en-mousse.org>
 2015-04-14 20:55:32 +00:00
Phil Estes 2f0f04e8fa Merge pull request #12292 from cpuguy83/remove_commands_integration 
Remove commands integration
 2015-04-14 16:17:25 -04:00
Alexander Morozov 676bf4afa5 Merge pull request #12282 from cpuguy83/remove_some_integration_tests 
Move integration/server_test tests to integration-cli
 2015-04-14 11:55:05 -07:00
Alexander Morozov 8f0b63925e Merge pull request #12363 from ahmetalpbalkan/integ-cli/use-sockRequest-statuscode 
integ-cli: Use status code from sockRequest (fix #12335)
 2015-04-14 09:38:10 -07:00
Alexander Morozov 5019f35111 Merge pull request #11980 from sunyuan3/TestSearchCmdOptions 
add TestSearchCmdOptions case
 2015-04-14 08:34:40 -07:00
Ahmet Alp Balkan 531433e765 integ-cli: Use status code from sockRequest (fix #12335) 
sockRequest now makes the status code available in the returned
values. This helps avoid string checking for non-HttpStatusOK(=200)
yet successful error messages.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-14 08:07:50 +00:00
Yuan Sun 77f2a4a0e3 add TestSearchCmdOptions case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-14 09:23:26 +08:00
Arnaud Porterie 00eddf5e67 Merge pull request #12353 from sunyuan3/duplicate 
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
 2015-04-13 17:48:53 -07:00
Brian Goff e4cfd9b392 MovetAttachDisconnect to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff 28cda04838 Move TestAttachDetachTruncatedID to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff ae0883ce00 Move TestAttachDetach to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:26 -04:00
Brian Goff f7538c77ef Move TestRunDetach to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 20:48:24 -04:00
Yuan Sun b85ade79d5 duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-14 08:32:25 +08:00
Jessica Frazelle 9a87553e4f cleanup test wrong key.json leading to other failures 
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-13 16:58:44 -07:00
Michael Crosby 12f7db1830 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
 2015-04-13 13:50:51 -07:00
Brian Goff 02706a40bb move TestImagesFilter to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00
Brian Goff 2c24a8a4ea Move TestCreateNumberHostname to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00
Brian Goff ed6074ea6b Move TestMergeOnCommit to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00
Brian Goff 9b4d9a3421 Move TestRunWithTooLowMemory to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00
Michael Crosby 75b911eb3c Merge pull request #12222 from chenhanxiao/cp-support-colon 
cp: add support for copy filename with ":"
 2015-04-13 13:09:12 -07:00
Evan Hazlett 6b40377c18 Merge pull request #12262 from YanFeng-Adam/daemon 
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
 2015-04-13 16:00:20 -04:00
Evan Hazlett 05433a4dab Merge pull request #12275 from LK4D4/pid_host_hell 
Get process list after PID 1 dead
 2015-04-13 14:50:23 -04:00
Evan Hazlett 3509132a6e Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
 2015-04-13 14:30:53 -04:00
Michael Crosby 0e46cc9be4 Merge pull request #12325 from hqhq/hq_fix_build_test 
fix build test by adding --no-cache
 2015-04-13 10:57:19 -07:00
Alexander Morozov 27fccdbabb Fix errors due changed sockRequest signature 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-13 10:30:07 -07:00
Michael Crosby 6f928be7ef Merge pull request #12320 from runcom/fix-api-resize-exec-resize 
fix api server resize&execResize
 2015-04-13 09:59:11 -07:00
Alexander Morozov bfb487dc50 Merge pull request #12304 from runcom/remove-job-logs 
Remove job from logs
 2015-04-13 08:38:46 -07:00
Hu Keping 1567cf2cdf Fix typo in testcase 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-13 23:09:07 +08:00
Qiang Huang c49cc1f2fb fix build test by adding --no-cache 
Testcase TestBuildResourceConstraintsAreUsed run build without
--no-cache, so if you run this test twice, it will fail the
second time.
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[PASSED]
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[FAIL]
Because we'll use cID to inspect field and will get empty cID
if we have cache.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-13 16:24:49 +08:00
Antonio Murdaca 3341f3a355 fix api server resize&execResize 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:42:12 +02:00
Antonio Murdaca 91bfed6049 Remove job from logs 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:25:31 +02:00
Eric Windisch ca37301d54 Link to HTTPS URLs in engine comments 
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-04-11 13:31:34 -04:00
Lei Jitang 72a500e9e5 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:26:37 +08:00
Lei Jitang 2cce4791b0 Add `-u|--user` flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:04:24 +08:00
Deng Guangxing 795a58fb44 'docker rmi -f IMAGE_ID' untag all names and delete the image 
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-11 09:24:21 +08:00
Alexander Morozov ac8bd12b39 Get process list after PID 1 dead 
Fix #11087

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-10 16:23:57 -07:00
Brian Goff 001a7e6bab Merge pull request #12103 from sunyuan3/pause 
add TestContainerApiPause case
 2015-04-10 18:04:29 -04:00
Brian Goff 96313f7ce0 Merge pull request #12250 from runcom/remove-job-wait 
Remove job from wait
 2015-04-10 16:27:59 -04:00
Antonio Murdaca db0ffba3b9 Remove job from wait 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-10 20:17:02 +02:00
Megan Kostick e7a2e2bf7e Rename TestStartSilentAttach to TestStartAttachSilent 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-10 10:45:38 -07:00
Yan Feng bfc68d10ed A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases. 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-10 11:10:26 -04:00
Doug Davis 5c8e28ec7c Merge pull request #12263 from chenhanxiao/typo-resize-test 
api_resize_test: fix a typo
 2015-04-10 05:46:42 -07:00
Chen Hanxiao 4ddc721f23 api_resize_test: fix a typo 
s/cintainer/container

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-10 03:09:26 -04:00
Chen Hanxiao 5037297388 cp: add support for copy filename with ":" 
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-10 00:08:05 -04:00
Tibor Vass fa2ace00a8 Rebase + some fixes 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-09 21:29:42 -04:00
David Young bf57339527 Add comment column in docker history command output 
Signed-off-by: David Young <yangboh@cn.ibm.com>
 2015-04-09 21:29:41 -04:00
Yuan Sun 8636a21991 add TestContainerApiPause case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-10 09:14:01 +08:00
Antonio Murdaca d38c90140b Fix TestBuildCancelationKillsSleep to not fail on Windows 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-09 21:03:19 +02:00
Alexander Morozov b02cf5239e Merge pull request #12115 from cpuguy83/fix_events_filter_test 
Cleanup events filter by container test
 2015-04-09 11:40:08 -07:00
Todd Whiteman 42d47c3136 fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
 2015-04-09 10:46:57 -07:00
Jessie Frazelle 2b96bd0bb8 Merge pull request #11895 from liusdu/m 
show the right image name in job log and docker ps
 2015-04-09 10:21:07 -07:00
Alexander Morozov 6ba7bf440e Merge pull request #12184 from duglin/RemoveJobImages 
Remove Job from `docker images`
 2015-04-09 09:19:09 -07:00
Arnaud Porterie 74b5c7b284 Merge pull request #12231 from ahmetalpbalkan/integ-cli/TestInfoEnsureSucceeds-all-required 
cli_info_test: Check all required fields
 2015-04-09 09:07:54 -07:00
Liu Hua 645c020f5a fix up Image-name related issues in docker ps and CI 
This patch include the following fixs:
 - fix image name error when docker ps
 - fix docker events test failure: use the exact image name for filter
 - fix docker build CI test failure due to "docker events" change

Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-04-09 23:03:23 +08:00
Brian Goff 7e70998bb8 Cleanup events filter by container test 
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.

Added check to make sure the filtered events have the expected ID's.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-09 09:47:58 -04:00
Ahmet Alp Balkan 4c69d0dd8a cli_info_test: Check all required fields 
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.

If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-09 04:01:39 -07:00
Doug Davis d045b9776b Remove Job from `docker images` 
Also removes engine.Table

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-08 19:33:01 -07:00
Jessica Frazelle 255b84444a cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-08 16:59:36 -07:00
Alexander Morozov 3ebfc99d10 Merge pull request #12066 from LK4D4/split_events 
Remove engine usage from events
 2015-04-08 08:29:24 -07:00
Yuan Sun cc30282e94 duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-08 13:33:05 +08:00
Alexander Morozov ce69dafe4d Test case for network mode chain container -> container -> host 
Issue #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 15:20:42 -07:00
Alexander Morozov 8fd2b52146 Fix fail message in TestEventsImageImport 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 14:22:43 -07:00
Megan Kostick 05dcf26199 Fixing fail message in TestRunDeviceDirectory 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-07 13:14:47 -07:00
Alexandr Morozov e45bf8d2e9 Decrease timeouts in TestEventsStreaming 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:40:56 -07:00
Alexandr Morozov 5fa3a6f248 Pass right timestamp instead of crap from string(int64) 
Problem is that --since can consume anything not near looking as
timestamp.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:39:02 -07:00
Alexander Morozov f5657249a0 Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey 
add TestDaemonwithwrongkey test case
 2015-04-06 11:35:05 -07:00
Alexander Morozov a0fc0343b7 Merge pull request #12090 from runcom/12079-events-streaming-tests 
Test events streaming
 2015-04-06 11:23:47 -07:00
Arnaud Porterie ed8d402851 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
 2015-04-06 11:11:31 -07:00
Antonio Murdaca d1c4439b5a Test events streaming, fixes #12079 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-06 19:00:17 +02:00
Brian Goff d3fa57e051 Merge pull request #12112 from kostickm/12042-fix-logDone-format 
Fixes logDone format
 2015-04-06 12:34:38 -04:00
Megan Kostick d6ada45f45 Closes #12042 - fix logDone format 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-06 08:54:35 -07:00
Arnaud Porterie b9d2ede4d4 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
 2015-04-06 08:46:08 -07:00
Eohyung Lee 7986c37996 Minor spelling fix 
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com>
 2015-04-06 23:27:53 +09:00
Brian Goff 475c65319b Remove `stripTrailingCharacters` from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-06 09:21:18 -04:00
Yuan Sun ef13dcd4dc add TestDaemonwithwrongkey test case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-06 08:57:47 +08:00
Jessie Frazelle 3683498d6f Merge pull request #12037 from twhiteman/master 
integration-cli: in TestPsListContainersSize, check for no containers
 2015-04-03 18:52:26 +00:00
Yuan Sun 87e0e4eb43 If docker search with --starts=${negative number}, it would show the warning. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-03 08:55:34 +08:00
Tibor Vass f92e88b7e0 Merge pull request #11995 from icecrime/test_daemon_stop 
Properly stop test daemon in integration-cli
 2015-04-02 20:27:20 -04:00
Arnaud Porterie 9c505c906d Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work 
Fixes docker events since beginning of unix time
 2015-04-02 15:03:04 -07:00
Todd Whiteman 3e51a81475 integration-cli: add check for TestPsListContainersSize when no containers are returned 
* when no containers are returned, go test would then aborts with:
  panic: runtime error: index out of range

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
 2015-04-02 14:45:52 -07:00
Tibor Vass c88b2c422f Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api 
TestVolumesFromHasPriority fix race
 2015-04-02 16:01:09 -04:00
Tibor Vass 42c7855014 Merge pull request #12011 from jfrazelle/fix-lxc-device-test 
fix device test on lxc...
 2015-04-02 16:00:39 -04:00
Arnaud Porterie 02c2308e39 Properly stop test daemon in integration-cli 
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-02 08:53:31 -07:00
unclejack cfa8aaf16f integration-cli: make TestPsGroupPortRange fast 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-02 18:26:29 +03:00
Tibor Vass 9707286a5c Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
 2015-04-02 08:25:49 -04:00
Jessica Frazelle c447fd339a TestVolumesFromHasPriority fix race 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
 2015-04-01 18:06:28 -07:00
Jessica Frazelle f472c7236f fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container... 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
 2015-04-01 17:47:36 -07:00
Jessica Frazelle 664004ed0c Mounting a directory of devices like /dev/snd should mount all child devices. 
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-04-01 15:57:41 -07:00
André Martins 8f7ac20bac Fixes docker events since beginning of unix time 
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.

Signed-off-by: André Martins <martins@noironetworks.com>
 2015-04-01 18:14:59 +01:00
Alexander Morozov 624de8a9cd Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest 
Fix random error in cli events test
 2015-04-01 09:26:48 -07:00
Doug Davis 39908fc6d9 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-01 08:11:15 -07:00
Deng Guangxing f5a401d3fe docker info show logging driver info 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-01 16:05:14 +08:00
Mabin e15c3e36cc Fix random bug in cli events test 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-04-01 11:00:01 +08:00
Doug Davis 8d1455d88b Increase timeout on TestRunOOMExitCode test 
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-31 16:57:43 -07:00
Jessie Frazelle 749a117267 Merge pull request #11934 from cpuguy83/fix_volume_symlink_check 
Fix volume symlink check
 2015-03-31 13:56:23 -07:00
Jessie Frazelle a381a1bb03 Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test 
Added basic integration tests for docker wait command
 2015-03-31 13:23:23 -07:00
Brian Goff 63708dca8a Use getResourcePath instead 
Also cleans up tests to not shell out for file creation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-31 15:10:30 -04:00
Michael Crosby b6d6ffa1dd Merge pull request #11896 from vdemeester/9998-cp 
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
 2015-03-30 13:15:00 -07:00
Yuan Sun f5310f403d Verify MaximumRetryCount=0 if the restart policy is always. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-03-30 09:08:33 +08:00