27e2837c6c
Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp
...
Fixes content-type/length for stats stream=false
2015-06-12 19:53:18 +02:00
e5b7f61f09
Replace "sleep" by "top" in test implementation
...
Eliminate any chance of race condition by replacing a call to sleep by a
call to top, and rely on test cleanup logic to have it exit cleanly.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-12 10:45:42 -07:00
2351557607
Merge pull request #13902 from ibuildthecloud/api-fixes
...
Set omitempty for IP and PublicPort to conform w/ API 1.18
2015-06-12 10:42:07 -07:00
855a056af7
Fixes content-type/length for stats stream=false
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-12 13:06:06 -04:00
09de92b891
Set omitempty for IP and PublicPort to conform w/ API 1.18
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-06-12 09:49:53 -07:00
5a02d0727b
Merge pull request #13899 from mavenugo/hp
...
Vendoring in libnetwork to fix #13873 .
2015-06-12 07:27:07 -07:00
f3d1826350
Vendoring in libnetwork to fix #13873 .
...
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-12 04:58:37 -07:00
d898372568
TestExecStopNotHanging: log output as string
...
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-06-11 22:53:55 -04:00
4cb0c93f92
api/client: Allow for multi-line usage help
...
Subcommands can provide multiple usage synopses.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-06-10 16:14:45 -07:00
12149e8293
Merge pull request #13754 from cpuguy83/13753_fix_events_64
...
Default events since to current time
2015-06-10 10:34:13 -07:00
74c12aa429
Default events since to current time
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-10 12:37:40 -04:00
46af724e81
Merge pull request #12371 from rhatdan/kill
...
docker kill should return error if container is not running.
2015-06-10 08:32:57 -07:00
4750e1f77e
Merge pull request #13784 from mrjana/cnm_integ
...
libnetwork: Add garbage collection trigger
2015-06-09 17:24:30 -07:00
5e86b818ed
Merge pull request #13828 from calavera/plugin_fixes
...
Fix volume plugin serialization.
2015-06-09 13:30:55 -07:00
18ddc2728d
Merge pull request #13805 from aboch/czo
...
Add integ test for unpublished ports in ps o/p
2015-06-09 11:30:06 -07:00
30448166de
Fix volume plugin serialization.
...
Unmarshal errors into strings.
Fix `omit` typos.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-09 10:39:46 -07:00
7b9ae696d8
Add integ test for unpublished ports in ps o/p
...
- This is a test to assert the fix #13734
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-09 09:40:19 -07:00
0e10507a1c
[builder] Make build cache ignore mtime
...
Build cache uses pgk/tarsum to get a digest of content which is
ADD'd or COPY'd during a build. The builder has always used v0 of
the tarsum algorithm which includes mtimes however since the whole
file is hashed anyway, the mtime doesn't really provide any extra
information about whether the file has changed and many version
control tools like Git strip mtime from files when they are cloned.
This patch updates the build subsystem to use v1 of Tarsum which
explicitly ignores mtime when calculating a digest. Now ADD and
COPY will result in a cache hit if only the mtime and not the file
contents have changed.
NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
function. It is a best-effort approach to determining if two sets of
filesystem content are different.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-06-08 13:54:47 -07:00
c68e7f96f9
libnetwork: Add garbage collection trigger
...
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-07 21:33:51 -07:00
54ac3d9c76
Made doc consistent with code
...
The name of the folder was shortened in a1ea562
2015-06-07 22:32:29 +02:00
07b22fcf50
Merge pull request #13787 from runcom/check-nil-Config
...
Avoid nil pointer dereference while creating a container with an empty Config
2015-06-07 12:28:41 -04:00
3d10540bc3
Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please
...
Restore --default-gateway{,-v6} daemon options.
2015-06-06 16:02:59 -07:00
4ce817796e
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-06 20:07:32 +02:00
ff9877ccc4
Rename test file to have _test postfix
...
Without this go test was unable to find line number of error in that
file.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-05 13:49:58 -07:00
af29aff53c
Merge pull request #13772 from icecrime/13770_image_labels_to_containers
...
Container don't inherit from image labels
2015-06-05 13:25:34 -07:00
79621c7728
Container don't inherit from image labels
...
Labels are metadata that apply to a particular resource: image,
container, maybe volumes and networks in the future. We shouldn't have
containers inherit from its image labels: they are not the same obejcts,
and labels cannot be interpreted in the way.
It remains possible to apply metadata to an image using the LABEL
Dockerfile instruction, to query them using `docker inspect <img>`, or
to filter images on them using `docker images --filter <key>=<value>`.
Fixes #13770 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-05 11:11:22 -07:00
078b8e54e4
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
2015-06-05 10:27:58 -07:00
0adfb908a6
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-05 09:50:30 -07:00
5fa60149e2
Restore --default-gateway{,-v6} daemon options.
...
This was added before the libnetwork merge, and then lost. Fixes #13755 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
2015-06-05 06:21:22 +00:00
0c84604f54
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-04 13:56:40 -07:00
543cf79ffb
Add GOOS in User-Agent
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-04 13:37:41 -07:00
9ec5e4f7df
Fix kr/pty import path
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-04 09:02:14 -07:00
6945ac2d02
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-03 23:13:56 +02:00
f18ce101fb
Merge pull request #13165 from ahmetalpbalkan/durations
...
Allow duration strings as --since/--until
2015-06-03 22:14:42 +02:00
a29633f687
Merge pull request #13703 from runcom/13691-container-ps-regression
...
Do not omit empty json field in /containers/json api response
2015-06-03 12:30:12 -07:00
c962f53a3e
Merge pull request #13645 from calavera/fix_stats_flaky_test
...
Fix stats flaky test.
2015-06-03 12:05:43 -07:00
725f34151c
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-03 18:53:40 +02:00
4f42097883
Fix nat integration tests
...
This removes complexity of current implementation and makes the test
correct and assert the right things.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-02 18:21:16 -07:00
6c42b3947a
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
2015-06-02 14:12:22 -07:00
4e3b21f99e
Allow duration strings as --since/--until
...
Fixes #13107 . This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.
Added unit tests for pkg/timeutils.GetTimestamp as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-02 21:02:47 +00:00
7d33bc0bec
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
2015-06-02 11:05:22 -07:00
2de2782fe8
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
2015-06-02 09:40:55 -07:00
39eec4c25b
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
2015-06-02 18:01:19 +02:00
e55649192e
test: Skip TestDevicePermissions on lxc
...
Closes : #13641
Signed-off-by: Zefan Li <lizefan@huawei.com>
2015-06-02 10:27:54 +08:00
aa8d8fdc0c
Merge pull request #13611 from duglin/Issue13417a
...
Allow .dockerignore to ignore everything
2015-06-01 15:59:57 -07:00
4fde1cb695
Fix stats flaky test.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-01 14:05:26 -07:00
cd80a61cc1
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
2015-06-01 14:04:33 -07:00
71d960d455
Merge pull request #13557 from ewindisch/apparmor-unshare-priv
...
Expand unshare test to include privileged test
2015-06-01 15:43:37 -04:00
8232312c1e
Cleanup container LogEvent calls
...
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.
Added testcases for new events: commit, copy, resize, attach, rename, top
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-01 12:39:28 -07:00
a7005c44b5
Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage
...
Add docker stats --no-stream show cpu usage
2015-06-01 09:40:04 -07:00
6fb454b9f0
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
2015-06-01 09:30:04 -07:00
d37aad170f
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
2015-06-01 12:29:45 -04:00
f2154a5a6b
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
2015-05-30 19:49:38 +02:00
96123a1fd5
Add docker stats --no-stream show cpu usage
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-31 01:25:51 +08:00
dc697b1c9f
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 07:48:46 -07:00
82ea6ed2bc
Allow .dockerignore to ignore everything
...
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.
Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.
Closes : #13417
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 04:16:00 -07:00
c61fa8471a
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-30 11:31:51 +02:00
c913c9921b
Fix issue #10184 .
...
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.
Signed-off-by: David R. Jenni <david.r.jenni@gmail.com>
2015-05-30 11:09:47 +02:00
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
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
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
185f392691
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-29 14:04:06 -07:00
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
15134a3320
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-29 22:38:09 +02:00
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
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
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
1392f99a97
skip test on lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-28 14:54:12 -07:00
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
617a0c2fde
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
2015-05-28 11:09:02 -07:00
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
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
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
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
2029257e3c
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
2015-05-27 08:44:11 -07:00
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
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
3f66f6f2f0
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
2015-05-27 13:59:40 +02:00
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
13f2aa7068
Add --net=container with --publish --publish-all --expose error out
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-27 15:31:06 +08:00
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
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
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
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
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
de318d8c1d
Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
...
Cleanup container rm funcs
2015-05-26 14:24:02 -07:00
40b71adee3
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5
2015-05-26 14:12:16 -07:00
47e727d1fc
Merge pull request #13440 from LK4D4/fix_bridge_none
...
Fix network with -b none
2015-05-26 14:08:21 -07:00
f8628ba891
Cleanup container rm funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-26 15:38:52 -04:00
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
aee9ac302d
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
ab121345ee
Cleanup: change test func name
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-25 14:51:10 +08:00
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
bce3e761c0
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
2015-05-23 18:44:18 -07:00
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
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
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
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
a1ea562b20
lol 108 chars ETOOMANY
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-22 10:10:17 -07:00
6809fa6861
Delete "defer deleteAllContainers()" from integration-cli
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-22 17:01:52 +08:00
4fc37a1ede
Mark --volume-driver as experimental
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-21 20:34:17 -07:00
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
2b8271399e
Merge pull request #13386 from icecrime/experimental_suffix_version
...
Suffix experimental version / fix warning output
2015-05-21 17:42:23 -07:00
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
78578125ce
Add suffix to experimental builds version
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-21 16:27:42 -07:00
7fffcfff32
Merge pull request #13387 from cpuguy83/fix_ngroutine_test
...
Better checking for LogsFollowGoroutinesWithStdout
2015-05-21 12:31:57 -07:00
2805ff1ece
Better checking for LogsFollowGoroutinesWithStdout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-21 14:13:01 -04:00
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
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
0fddb6ad7e
Merge pull request #13263 from rajdeepd/dry-run-test-2
...
TestCase for CpuShares and Cpuset
2015-05-20 23:33:42 +02:00
6f75dd85c5
add unshare apparmor profile test
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-20 14:06:00 -07:00
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
ebe344d34b
TestCase for CpuShares and Cpuset
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
2015-05-20 11:32:48 -07:00
53a795378d
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
2015-05-20 11:13:56 -07:00
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
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
086b514f6a
Removed deleteContainer calls
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-05-20 08:38:23 +02:00
d29dc0b608
Merge pull request #13325 from LK4D4/cleanup_mounts
...
Fix Put without Get in overlay
2015-05-20 03:11:58 +02:00
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
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
a2787469ac
Using dockerCmd when possible
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-05-19 20:33:59 +02:00
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
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
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
aac645ae04
Merge pull request #13282 from duglin/RemoveBash
...
Remove use of 'bash' from our tests
2015-05-18 13:06:21 -07:00
ccf02a9f77
Merge pull request #13279 from hqhq/hq_use_inspectfield
...
Use inspectField to simplify code
2015-05-18 14:53:37 -04:00
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
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
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
74f8a4eca4
Use inspectField to simplify code
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-18 10:06:13 +08:00
9a09664b51
Fix automatically publish ports without --publish-all
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-18 02:57:17 +08:00
a268e36719
Clean tests from not needed inspect call
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-16 18:12:54 +02:00
b5e932a3bf
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
2015-05-16 09:05:03 -07:00
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
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
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
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
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
e4855eebf2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
2015-05-14 16:49:01 -07:00
b2ad9314a2
Merge pull request #13196 from crosbymichael/update-libocntainer-may13
...
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
2015-05-14 10:49:25 -07:00
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
fe6f77df2c
Merge pull request #13087 from duglin/FixNatTest
...
Fix random errors in DockerSuite.TestNetworkNat
2015-05-14 08:35:27 -07:00
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
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
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
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
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
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
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
677d76cd4a
Update test for /sys mounting
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-13 15:02:53 -07:00
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
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
1b678f86b3
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
2015-05-13 11:35:17 -07:00
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
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
fdec5197f1
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-05-13 12:49:19 +03:00
e00cfbb6f2
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-13 14:28:52 +08:00
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
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
2fe2f7a186
integ-cli: Fix race in TestLogsSince
...
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-13 02:59:11 +00:00
36d995a291
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
2015-05-12 18:24:04 -07:00
0024935f64
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-12 17:22:41 -07:00
37cb2a15bf
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
2015-05-12 13:52:49 -07:00
f35038dfba
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
2015-05-12 13:08:36 -07:00
73387bf15a
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
2015-05-12 11:36:55 -07:00
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-12 20:09:49 +02:00
e3ba3dd5b8
Make sure log pipes are closed
...
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-12 13:50:51 -04:00
d0459abe6e
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
2015-05-12 09:40:16 -04:00
8cc93856e3
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
2015-05-11 13:18:29 -07:00
c6e6223ed7
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 21:50:47 +02:00
cb9a6b9aed
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-10 20:42:14 +00:00
006c066b6c
Fix RUN err msg (again)
...
Previous fix used %q which incorrectly go-escaped things. For example:
```
RUN echoo A \& B C
```
would result in the user seeing:
```
INFO[0000] The command '/bin/sh -c echoo A \\& B\tC' returned a non-zero code: 127
```
Note the double-\ and the \t instead of a tab character
The testcase had to double escape things due to logrus getting in the way
but I'm going to fix that in another PR because its a change to the UX.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-09 09:22:30 -07:00
dd4693f67c
Add missing "ok" on "common ok" idiom in test util
...
w/o this the "ok" we're checking is from the previous type assertion.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-09 05:56:10 -07:00
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
769df832a3
Fix random errors in DockerSuite.TestNetworkNat
...
I believe this was failing because 'nc' wouldn't show the data
it received sometimes. So intead of looking for that data we now
look for the output of the echo that comes after the nc command
successfully runs
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-08 10:59:26 -07:00
af9dac9627
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
2015-05-07 22:07:41 -04:00
52118df432
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 17:40:37 -07:00
6b6a26c769
Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode
...
add support --net=container with --mac-address, --add-host error out
2015-05-07 17:13:32 -07:00
de32f5c431
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
2015-05-07 17:10:39 -07:00
e03ac8d5b9
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
2015-05-07 17:04:20 -07:00
d0bc0153c6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
2015-05-07 17:01:16 -07:00
0ed2013590
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
2015-05-07 16:52:46 -07:00
372977148d
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
2015-05-07 16:51:56 -07:00
b4e8942367
Merge pull request #13076 from LK4D4/fix_api_daemon_order
...
Fix api servers creation and daemon start order
2015-05-07 16:23:44 -07:00
2c2f6fd272
bump version back to 1.7.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 15:42:36 -07:00
08230703fd
Fix api servers creation and daemon start order
...
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
/var/run/docker.sock by some container
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-07 15:38:02 -07:00
f25bbedc85
Allow libcontainer to eval symlink destination
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Add tests for mounting into /proc and /sys
These two locations should be prohibited from mounting volumes into
those destinations.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:43:39 -07:00
a7a51306b1
Mask reads from timer_stats and latency_stats
...
These files in /proc should not be able to be read as well
as written to.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:42:23 -07:00
27ae108b4e
Mount RO for timer_stats and latency_stats in proc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:42:23 -07:00
d87da59c79
Prevent write access to /proc/asound
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
integration-cli/docker_cli_run_test.go
2015-05-07 14:42:23 -07:00
74bfa36753
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
2015-05-07 14:01:16 -07:00
80d73c838a
Test Cases for API - Container create with Hostname, DomainName and NetworkMode
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-07 21:03:39 +02:00
d78755d159
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
2015-05-07 09:38:59 -07:00
68e9c07850
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-05-07 15:43:50 +00:00
f133f11a7d
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-07 11:55:58 +08:00
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
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
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
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
f9b20ad9e4
Merge pull request #12999 from duglin/BadRUNerrMsg
...
Fix RUN's error msg when it fails
2015-05-06 15:49:24 -04:00
71c1a7ea7f
Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes
...
Fix LXC stop signals
2015-05-06 11:21:44 -07:00
7c574b9e9d
Move ChunkedEncoding from integration
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-06 13:00:17 -04:00
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
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
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
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
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
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
5a6db4fd44
a few cleanups for client output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-05 15:59:17 +08:00
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
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
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
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
8771cafab6
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-04 22:41:57 +02:00
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
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
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
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
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
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
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
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
1f2f3db1e3
Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit
...
TestDiffEnsureDockerinitFilesAreIgnored is too long
2015-05-01 14:52:34 -07:00
5c86f311c8
Fix TestApiImagesDelete for --net none build
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 20:49:28 +02:00
0d0b42547e
Merge pull request #12771 from runcom/say-bye-to-engine
...
Remove engine
2015-04-30 12:18:16 -04:00
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
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
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
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
1c073ec176
Moved explicit cleanups into defered action
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-04-29 11:41:13 -07:00
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
ba11929ebd
Integration tests for --ip daemon option
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-04-29 09:55:49 -07:00
0e254411b1
Integration tests for --fixed-cidr daemon config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-04-29 09:55:42 -07:00
9c325c3f54
Integration tests for --bip daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-04-29 09:55:34 -07:00
f3f5ff9d83
Integration tests for --bridge daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-04-29 09:55:25 -07:00
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
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
f80300e9cf
Merge pull request #12789 from LK4D4/daemon_suite
...
Implement daemon suite for integration-cli
2015-04-28 15:30:36 -07:00
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
6fd8e485c8
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
2015-04-28 18:56:45 +01:00
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
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
0153edcda1
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
2015-04-27 17:05:46 -04:00
62a85fe202
Merge pull request #12794 from runcom/small-cleaning
...
Small if err cleaning
2015-04-27 17:02:27 -04:00
3941623fbc
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
2015-04-27 13:35:08 -07:00
50868b2c57
fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672
...
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
2015-04-27 13:24:15 -07:00
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
40779b28bb
Parallelize TestEventsLimit
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-04-27 21:14:00 +02:00
bb1c576eb3
Expose whole Response struct in sockRequestRaw
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 18:49:00 +02:00
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
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
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
325c0404c8
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
2015-04-27 10:42:40 -04:00
9e0ffae864
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-27 10:14:29 -04:00
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
c7b2632dc8
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 13:56:55 +02:00
fefb836766
Merge pull request #12728 from HuKeping/addtest
...
Add test for REST API container rename
2015-04-25 17:01:10 -07:00
9dbe12b792
Migrate integration test to new method
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-25 17:12:01 -04:00
65aba0c9d6
Add dep to test
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-25 15:25:52 -04:00
f039c699a4
Fix gofmt
...
Mischevious comma is mischevious
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-25 15:25:52 -04:00
f40dd69c97
Add test for cgroup parent flag for build
...
Signed-off-by: Marianna <mtesselh@gmail.com>
2015-04-25 15:25:52 -04:00
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
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
8f752ffeaf
Add test for REST API container rename
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-25 17:19:57 +08:00
6e9a6f5396
Merge pull request #12765 from LK4D4/registry_suite
...
Implement DockerRegistrySuite in integration-cli
2015-04-24 23:05:29 -04:00
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
9bea123bdd
Not protect dangling images for integration-cli
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-24 13:16:51 -07:00
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
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
03719be830
Merge pull request #12754 from LK4D4/carry_12707
...
fix runtime issue for TestEventsFilterContainer
2015-04-24 14:36:58 -04:00
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
a9688cdca5
Implement teardown removeAllImages
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-24 10:37:21 -07:00
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
5f4fb8be00
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-24 08:54:08 +08:00
9d94d91ea7
Merge pull request #12569 from kostickm/12449-check-statusCode
...
Fixing statusCode checks for sockRequest
2015-04-23 17:13:06 -07:00
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
c7845e27ee
Fixing statusCode checks for sockRequest
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-23 15:35:56 -07:00
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
96ef1bd29c
Merge pull request #12709 from vdemeester/12705-remove-defer-deleteContainer
...
delete "defer deleteContainer" on tests
2015-04-23 14:34:23 -07:00
b31d154294
Merge pull request #12509 from runcom/12499-racy-TestEventsImageImport
...
Fix TestEventsImageImport racy
2015-04-23 13:28:43 -07:00
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
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
68fc79f592
Merge pull request #12655 from jlhawn/fix_12281
...
Validate repo name before image pull
2015-04-23 13:12:12 -07:00
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
036ade6c05
Merge pull request #12693 from runcom/fix-TestRenameStoppedContainer-race
...
Fix TestRenameStoppedContainer race
2015-04-23 13:04:36 -07:00
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
03e77e5c8f
Merge pull request #12690 from rajdeepd/dry-run-test
...
Container API Test with HostName
2015-04-23 11:32:47 -07:00
59acccb6f2
Merge pull request #12692 from cpuguy83/fix_commit_test
...
Fix race with TestContainerApiCommit
2015-04-23 11:31:27 -07:00
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
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
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
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
ee7a7b07e7
Remove deleteAllContainers call in test
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 16:32:50 +02:00
cd6cc45d52
Fix TestRenameStoppedContainer race
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 16:11:46 +02:00
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
563708d78d
Fix race with TestContainerApiCommit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-23 09:45:06 -04:00
f4cfaac519
Merge pull request #12680 from Mashimiao/fix-typo-push-test
...
push test: fix typo
2015-04-23 07:37:50 -04:00
62f91b1d34
push test: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-23 16:50:41 +08:00
eae272f90e
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
2015-04-22 23:06:13 -04:00
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
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
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
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
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
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
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 00:58:13 +02:00
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
7a525c6cb7
add integration test for error pull nonexistent
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-22 14:11:25 -07:00
29265448ec
Merge pull request #12621 from LK4D4/test_push_interrupt_daemon
...
Run TestPushInterrupt on separate daemon
2015-04-22 14:05:37 -07:00
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
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
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
eeb8ceb9ed
Fix TestEventsImageImport racy, fixes #12499
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-22 17:30:30 +02:00
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
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
874d64e690
Merge pull request #12517 from mavenugo/master
...
Enhanced port integration-cli tests
2015-04-20 17:26:48 -07:00
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
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
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
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
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
53edce79f1
Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction
...
12553 fix typo
2015-04-20 14:30:51 -04:00
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
cdd5d5e4c3
fix typo
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
2015-04-20 18:56:21 +01:00
dcc50e1d59
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-20 08:16:47 -07:00
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
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
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
5fd378c0d1
Merge pull request #12466 from robertabbott/fix_dockerCmd
...
Removed unnecessary error output from dockerCmd
2015-04-17 15:15:34 -07:00
055c6dbaef
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
2015-04-17 15:26:30 -04:00
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
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
a0bf80fe03
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-17 14:27:38 +02:00
5e40de9286
Merge pull request #12468 from icecrime/disable_test_pull_verified
...
Skip TestPullVerified
2015-04-17 02:31:01 -04:00
9a4fa9c191
Skip TestPullVerified
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-16 23:05:47 -07:00
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
4e356ee410
Improve export/import tests cleanup
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-16 22:10:55 -07:00
308a23021d
Move TestPostCreateNull to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:49:46 -04:00
5dc02a2fa8
Move TestPostJsonVerify to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:49:28 -04:00
23fa7d41d5
Move TestContainerApiCreate to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:49:10 -04:00
f19061ccfd
Move TestPostCommit to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:48:54 -04:00
d9e4b14346
Move TestGetContainersTop to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:48:33 -04:00
6f5b895bc7
Move SaveAndThenload to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:40:49 -04:00
8232cc777e
Make sockRequestRaw return reader, not []byte
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-16 13:40:49 -04:00
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
8077b2fb80
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:33:46 +08:00
2ea1febd9a
Remove unnecessary fmt.Printf
...
Signed-off-by: Thomas Texier <sharkone@en-mousse.org>
2015-04-14 20:55:32 +00:00
2f0f04e8fa
Merge pull request #12292 from cpuguy83/remove_commands_integration
...
Remove commands integration
2015-04-14 16:17:25 -04:00
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
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
5019f35111
Merge pull request #11980 from sunyuan3/TestSearchCmdOptions
...
add TestSearchCmdOptions case
2015-04-14 08:34:40 -07:00
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
77f2a4a0e3
add TestSearchCmdOptions case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-14 09:23:26 +08:00
00eddf5e67
Merge pull request #12353 from sunyuan3/duplicate
...
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
2015-04-13 17:48:53 -07:00
e4cfd9b392
MovetAttachDisconnect to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 20:48:26 -04:00
28cda04838
Move TestAttachDetachTruncatedID to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 20:48:26 -04:00
ae0883ce00
Move TestAttachDetach to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 20:48:26 -04:00
f7538c77ef
Move TestRunDetach to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 20:48:24 -04:00
b85ade79d5
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-14 08:32:25 +08:00
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
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
02706a40bb
move TestImagesFilter to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 16:40:48 -04:00
2c24a8a4ea
Move TestCreateNumberHostname to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 16:40:48 -04:00
ed6074ea6b
Move TestMergeOnCommit to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 16:40:48 -04:00
9b4d9a3421
Move TestRunWithTooLowMemory to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-13 16:40:48 -04:00
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
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
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
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
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
27fccdbabb
Fix errors due changed sockRequest signature
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-13 10:30:07 -07:00
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
bfb487dc50
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
2015-04-13 08:38:46 -07:00
1567cf2cdf
Fix typo in testcase
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-13 23:09:07 +08:00
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
3341f3a355
fix api server resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:42:12 +02:00
91bfed6049
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:25:31 +02:00
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
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
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
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
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
001a7e6bab
Merge pull request #12103 from sunyuan3/pause
...
add TestContainerApiPause case
2015-04-10 18:04:29 -04:00
96313f7ce0
Merge pull request #12250 from runcom/remove-job-wait
...
Remove job from wait
2015-04-10 16:27:59 -04:00
db0ffba3b9
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 20:17:02 +02:00
e7a2e2bf7e
Rename TestStartSilentAttach to TestStartAttachSilent
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-10 10:45:38 -07:00
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
5c8e28ec7c
Merge pull request #12263 from chenhanxiao/typo-resize-test
...
api_resize_test: fix a typo
2015-04-10 05:46:42 -07:00
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
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
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-09 21:29:42 -04:00
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
8636a21991
add TestContainerApiPause case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-10 09:14:01 +08:00
d38c90140b
Fix TestBuildCancelationKillsSleep to not fail on Windows
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 21:03:19 +02:00
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
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
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
6ba7bf440e
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
2015-04-09 09:19:09 -07:00
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
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
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
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
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
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
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
cc30282e94
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-08 13:33:05 +08:00
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
8fd2b52146
Fix fail message in TestEventsImageImport
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 14:22:43 -07:00
05dcf26199
Fixing fail message in TestRunDeviceDirectory
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-07 13:14:47 -07:00
e45bf8d2e9
Decrease timeouts in TestEventsStreaming
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2015-04-06 13:40:56 -07:00
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
f5657249a0
Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey
...
add TestDaemonwithwrongkey test case
2015-04-06 11:35:05 -07:00
a0fc0343b7
Merge pull request #12090 from runcom/12079-events-streaming-tests
...
Test events streaming
2015-04-06 11:23:47 -07:00
ed8d402851
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
2015-04-06 11:11:31 -07:00
d1c4439b5a
Test events streaming, fixes #12079
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-06 19:00:17 +02:00
d3fa57e051
Merge pull request #12112 from kostickm/12042-fix-logDone-format
...
Fixes logDone format
2015-04-06 12:34:38 -04:00
d6ada45f45
Closes #12042 - fix logDone format
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-06 08:54:35 -07:00
b9d2ede4d4
Merge pull request #12107 from cpuguy83/remove_striptrailingchars
...
Remove `stripTrailingCharacters` from tests
2015-04-06 08:46:08 -07:00
7986c37996
Minor spelling fix
...
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com>
2015-04-06 23:27:53 +09:00
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
ef13dcd4dc
add TestDaemonwithwrongkey test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-06 08:57:47 +08:00
3683498d6f
Merge pull request #12037 from twhiteman/master
...
integration-cli: in TestPsListContainersSize, check for no containers
2015-04-03 18:52:26 +00:00
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
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
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
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
c88b2c422f
Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
...
TestVolumesFromHasPriority fix race
2015-04-02 16:01:09 -04:00
42c7855014
Merge pull request #12011 from jfrazelle/fix-lxc-device-test
...
fix device test on lxc...
2015-04-02 16:00:39 -04:00
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
cfa8aaf16f
integration-cli: make TestPsGroupPortRange fast
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-02 18:26:29 +03:00
9707286a5c
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
2015-04-02 08:25:49 -04:00
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
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
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
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
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
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
f5a401d3fe
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-01 16:05:14 +08:00
e15c3e36cc
Fix random bug in cli events test
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-04-01 11:00:01 +08:00
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
749a117267
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
2015-03-31 13:56:23 -07:00
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
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
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
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
8bc330d863
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
...
Add a integration test TestCpSpecialFiles
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-03-29 22:10:14 +02:00
7583b49125
Fix create volume in a directory which is a symbolic link
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-29 13:35:36 +08:00
013fb87543
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-28 09:07:20 +08:00
240f3e14c7
Merge pull request #11848 from duglin/CleanupIntTests
...
Clean up integration-cli tests
2015-03-27 14:11:56 -07:00
8c58bdd3a7
Merge pull request #11842 from brahmaroutu/events_tests
...
Events tests
2015-03-27 13:45:11 -07:00
f5ad895ba6
Use common code to test all events, when using filter that expect all lifecycle events.
...
Addresses: #10654
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-03-27 02:47:46 +00:00
9a9d23dbc4
Clean up integration-cli tests
...
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-26 17:25:50 -07:00
ae907e7af1
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
2015-03-26 15:05:45 -06:00
1401b8fe0d
Added integration tests for docker wait command
...
Signed-off-by: Pradeep Chhetri <pradeep@indix.com>
2015-03-27 01:24:11 +05:30
a196cc943c
Merge pull request #11791 from moo-mou/11768-vetwarning
...
Fix vet warning
2015-03-26 10:52:07 -07:00
389d0ae453
Fix TestBuildResourceConstraintsAreUsed Cpuset test
...
Set cpuset to "0" so that it works on single core machines.
W/o this (and set to "1") we'll see something like this error
when running:
System error: write /cgroup/cpuset/docker/66689499bbd08cd8dccc9b7bfd1d6b34e85d73ce8c84d3c69b5e91944322da60/docker/79d7c548b58c85c4cfad6cd01eb7c3b30db254d1014c496137edd93ddc528a6f/cpuset.cpus: invalid argument"
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-26 07:31:39 -07:00
c2fe262439
Add fixes for integration-cli tests w/ --net none
...
Adds network to integration tests that were failing without network.
Fixes #10964
Fixes #10968
Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com>
2015-03-25 23:46:04 -04:00
c5bf2145f1
Fix vet warning
...
Signed-off-by: Paul Mou <ppymou@gmail.com>
2015-03-25 20:31:02 -07:00
a0cfe83435
Merge pull request #11751 from tiborvass/revert-validate-spaces
...
Revert "Dealing with trailing whitespaces"
2015-03-25 13:01:58 -04:00
5f7e142c46
Merge pull request #11729 from icecrime/11048_carry
...
Carry #11048
2015-03-25 09:27:07 -07:00
0252ad0adc
Revert "Dealing with trailing whitespaces"
...
The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319
2015-03-25 10:04:56 -06:00
f08e9f44a9
Merge pull request #11737 from duglin/FixTestOutput
...
TestBuildCancelationKillsSleep sends exec cmd to stdout
2015-03-25 08:45:09 -07:00
c959d26d2f
fix 2 integration tests on lxc
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-24 21:12:16 -07:00
fbd47969a8
TestBuildCancelationKillsSleep send exec cmd to stdout
...
and makes the testing output ugly.
This hides the output since it not used.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-24 20:56:26 -07:00
8900ae2928
Revert all but TestPullImageFromCentralRegistry changes
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-24 16:27:35 -07:00
f3fc857e01
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
2015-03-24 14:58:30 -07:00
1e788ec985
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-24 10:47:30 -07:00
b80fae7356
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 18:19:59 +01:00
d5eea4e8b0
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
2015-03-23 16:58:29 -07:00
4e3c72a026
Merge pull request #11667 from icecrime/integration-cli_image_cleanup
...
Cleanup "hello-world" image in build tests
2015-03-23 16:42:46 -07:00
92f9e2d395
Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
...
#11602 - Cleanup redundant else statements find via golint
2015-03-23 18:27:29 -05:00
5d70a97b1f
Fix the TestPullImageFromCentralRegistry to skip and add local v1 registry test when net=none
...
Closes #10966
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-03-23 22:53:04 +00:00
197a3f0a98
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
2015-03-23 15:38:51 -07:00
3b4ff1c132
Merge pull request #11264 from brahmaroutu/fixtest_10967
...
Test image api through local V1 repo, skip network test.
2015-03-23 15:20:39 -07:00
bfc748221b
Cleanup "hello-world" image in build tests
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-23 15:16:13 -07:00
664ef0cbe2
Cleanup redundant else statements find via golint #11602
...
Signed-off-by: George MacRorie <gmacr31@gmail.com>
2015-03-23 20:40:29 +00:00
8b02d85e17
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 20:58:16 +01:00
61966d281b
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
2015-03-23 13:30:11 -05:00
85ab3c3b49
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
2015-03-23 11:21:16 -07:00
1fe55b2f8b
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
2015-03-23 10:43:02 -07:00
bd95202161
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
2015-03-23 10:17:50 -07:00
56acb1aac8
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
2015-03-23 09:59:40 -07:00
5daa9260bc
Test image api through local V1 repo
...
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-03-23 16:45:48 +00:00
d124197cc7
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 13:03:31 +01:00
a91b2431a3
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-22 23:53:47 -07:00
7dc1af146d
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-23 12:10:22 +08:00
ded0ada9b4
Merge pull request #11538 from duglin/EmptyVolume
...
Check volume path to make sure its not the empty string
2015-03-22 19:25:50 -07:00
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
33448ac3c9
Restore TestPullVerified test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-22 17:56:05 -07:00
df389df990
Skip TestPullVerified because hello-world image cannot be verified
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-03-22 19:34:40 -04:00
671c12204c
Implement build cancellation
...
Add the capability to cancel the build by disconnecting the client.
This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.
This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.
* Add documentation of cancellation to cli and API
* Protect job cancellation with sync.Once
* Add TestBuildCancelationKillsSleep
* Add test case for build cancellation of RUN statements.
Signed-off-by: Peter Waller <p@pwaller.net>
2015-03-22 11:31:28 +00:00
28a34dfffd
integ-cli: fix bug and race in TestBuildSpaces
...
`TestBuildSpaces` is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one `time=".."` in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps.
Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-21 19:43:14 +00:00
b7dc9040f0
Change windows default permissions to 755 not 711, read access for all poses little security risk and prevents breaking existing Dockerfiles
...
Signed-off-by: Mitch Capper <mitch.capper@gmail.com>
2015-03-20 21:54:33 -07:00
8071bf3967
Check volume path to make sure its not the empty string
...
With this Dockerfile
```
FROM ubuntu
ENV ABC=""
VOLUME $ABC
```
It builds ok but then at run time I get this error:
FATA[0002] Error response from daemon: Cannot start container 8902b4a7aaf5c4e4b11a38070d392db465fa97ad88c91c8b38dda5ab8149ccac: [8] System error: no such file or directory
Because the Volume config shows "" as the path. This PR checks for "" as
the path and stops it at build time.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 21:39:49 -07:00
6d66e3e7a5
Fix some escaping around env var processing
...
Clarify in the docs that ENV is not recursive
Closes #10391
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 20:09:00 -07:00
e3e6f8e859
Merge pull request #11531 from vishh/parent-cgroup
...
Remove debug log line from cgroup-parent feature e2e test.
2015-03-20 20:30:01 -04:00
84d3ab30d4
Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode
...
Fix hostname missing when a container's net mode is contaienr mode
2015-03-20 16:49:37 -07:00
a7639c2e1f
Remove debug log line from cgroup-parent feature e2e test.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-20 23:25:34 +00:00
c536e5bfb4
Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
...
Add cli build warning about chmod bits on windows
2015-03-20 19:19:38 -04:00
41f2b010c6
Merge pull request #11525 from cpuguy83/10969-cleanup-unix-sockets
...
cleanup unix sockets
2015-03-20 14:55:17 -07:00
Antonio Murdaca
Arnaud Porterie
Brian Goff
Darren Shepherd
Madhu Venugopal
Daniel, Dao Quang Minh
Josh Hawn
Jessie Frazelle
Doug Davis
Michael Crosby
Alexander Morozov
David Calavera
Alessandro Boch
Jana Radhakrishnan
Michael Käufl
Antonio Murdaca
Alexander Morozov
Jessica Frazelle
Eric-Olivier Lamey
John Howard
Ahmet Alp Balkan
Antonio Murdaca
Zefan Li
Phil Estes
Doug Davis
Sebastiaan van Stijn
Lei Jitang
Vincent Demeester
David R. Jenni
Antonio Murdaca
Eric Windisch
Qiang Huang
Dan Walsh
Hu Keping
Tibor Vass
Zhang Wei
Rajdeep Dua
Lorenzo Fontana
Mingzhen Feng
Nuutti Kotivuori
unclejack
Ma Shimiao
Srini Brahmaroutu
Anthony Baire
Yuan Sun
mauriyouth
Raghuram Devarakonda
Tianon Gravi
buddhamagnet
David Mackey
Daniel Antlinger
Aidan Hobson Sayers
Nathan LeClaire
Marianna
Regan McCooey
Michael Crosby
Megan Kostick
Srini Brahmaroutu
Ankush Agarwal
Sergey Evstifeev
Simei He
bobby abbott
Thomas Texier
Jessica Frazelle
Evan Hazlett
Deng Guangxing
Yan Feng
Chen Hanxiao
Tibor Vass
David Young
Todd Whiteman
Liu Hua
Eohyung Lee
André Martins
Mabin
Peter Choi
Pradeep Chhetri
Jake Champlin
paul
George MacRorie
Peter Waller
Mitch Capper
Vishnu Kannan