ba33babd07
Merge pull request #6415 from LK4D4/increase_timeout_in_test_attach
...
Increase time before exit in TestMultipleAttachRestart
Upstream-commit: ec0fb311ed01615c0e2773cd224f43de94a762ab
Component: engine
2014-06-18 00:36:18 +03:00
017a78b3c1
Move TestBuildAddToSymlinkDest to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: cc42eeac21caa962bed94878fe2eab00735cd00d
Component: engine
2014-06-17 23:44:30 +04:00
f48cbf9c53
Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 690711b5840be388fb13fb72856de337bdf645c7
Component: engine
2014-06-17 11:39:47 +04:00
3ac290e972
Move TestBuildOnBuildForbiddenFromTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1c8ec01c551b3cfac8548d7fd22a50b3c236e362
Component: engine
2014-06-17 11:36:45 +04:00
17786f89f8
Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1e0e86360f8fefbeb3d70642aa0402bcb0c97a1a
Component: engine
2014-06-17 11:24:47 +04:00
417be2b8be
Move TestBuildOnBuildTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 2629e2ec236a377973e7be296013e366b4074d44
Component: engine
2014-06-17 11:14:45 +04:00
0c3b5a8a2c
Move TestBuildFailsDockerfileEmpty to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 08a10f936b4b5a69d3be6d320499c025a399fddb
Component: engine
2014-06-17 11:06:44 +04:00
85c70b022e
Move TestBuildFails to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: d3023f25f5c9e1173fe1cf1dbb449a926dc85cfd
Component: engine
2014-06-17 11:06:40 +04:00
285461876d
Move TestBuildInheritance to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: f1d7ed35bd17c5e8e8f4d1882b5e98ae5419e9f1
Component: engine
2014-06-17 11:05:45 +04:00
fd55280b29
Move TestBuildADDFileNotFound to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 62d97afaf8d328b42c028323f10c3f4782f03561
Component: engine
2014-06-17 11:05:36 +04:00
f7987f5c93
Move TestForbiddenContextPath to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 686786f107582c27c69a6f40655c8fc52a8e4d00
Component: engine
2014-06-17 10:38:45 +04:00
f81562b040
Move TestBuildEntrypointRunCleanup to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c5b82f5e8dd5c519330e02502e5b9f9031a6509a
Component: engine
2014-06-17 10:16:36 +04:00
83d64fe636
Increase time before exit in TestMultipleAttachRestart
...
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: eb97163348d88954dbacbcbc7eed71efd666dddc
Component: engine
2014-06-13 21:40:30 +04:00
13764748a8
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 9494643bf1fcd38974266555e59e1b2d2573c418
Component: engine
2014-06-12 19:11:51 +00:00
124f8c9778
Merge pull request #6145 from shykes/pr_out_pkg_testutils_utility_functions_to_facilitate_writing_go_tests
...
pkg/testutils: utility functions to facilitate writing Go tests
Upstream-commit: 2f72fdf6eac43ebb89028308a6d5a5fac0b93ecc
Component: engine
2014-06-06 01:26:53 +03:00
ddc2df6d84
IANA allocated Docker port: 2375
...
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
For #1440
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5febba93babcf8c4b01862e88b6f6e11a1532bc8
Component: engine
2014-06-04 06:54:19 +10:00
f363828126
Merge pull request #6171 from crosbymichael/add-chroot
...
Add SYS_CHROOT cap to unprivileged containers
Upstream-commit: 5bf4068d60222b1fdfc997e498aa2096b8df3cf9
Component: engine
2014-06-02 18:33:34 -07:00
382f8a23ad
Add SYS_CHROOT cap to unprivileged containers
...
Fixes #6103
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 41f7cef2bd186d321fc4489691ba53ab41eb48e5
Component: engine
2014-06-02 18:23:47 -07:00
fef574365b
Add test for volume ownership and perms
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c024c9bd1ec13aade038f87266a03a1d1bc13441
Component: engine
2014-06-02 18:10:52 -07:00
cd037b482e
Merge pull request #6143 from LK4D4/move_some_more_tests_to_cli
...
Move some more tests to integration cli
Upstream-commit: f65fadbda080647ccb7e07dc64a8cc020170c4c7
Component: engine
2014-06-02 18:06:11 -07:00
82a799b98b
pull only busybox:latest
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b8932abcd3f3932b6b56aa859b4c0762a95f7179
Component: engine
2014-06-02 19:54:17 +00:00
21fda68864
Move build cache tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ae128437cefa93bba082a0231e2cd05d33991c81
Component: engine
2014-06-02 23:40:14 +04:00
2b6fe57d0d
More verbose build tests
...
I've decided that custom asserts only hide the meaning of tests
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: bf4d907092a81bf8c6bd8a6a2ce2105aa3c8c11d
Component: engine
2014-06-02 23:40:13 +04:00
ecc54a77db
Aux functions for build testing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 2e85568816315a6544ce1c379a5b2b714fb16524
Component: engine
2014-06-02 23:40:13 +04:00
77921a7a55
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
Upstream-commit: 3e13aaec000aeaa16718e2408b0c371e4de69137
Component: engine
2014-06-02 12:03:11 -07:00
d8a617a361
Fix format in maintainers files
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 0a06e9bd91faff2c129fd5a7b30b85351c96601f
Component: engine
2014-06-02 07:05:06 +00:00
b92a4a943f
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
Upstream-commit: 2024a0e517d9b5e009bd8935de60c4782cc1d17a
Component: engine
2014-06-01 01:26:31 +03:00
2a289bda14
Standardize API keys: CamelCase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 68fb7f4b744bf71206898d32fe203556a6261e5d
Component: engine
2014-05-31 01:22:07 +00:00
52c8a31f21
Refactor device handling code
...
We now have one place that keeps track of (most) devices that are allowed and created within the container. That place is pkg/libcontainer/devices/devices.go
This fixes several inconsistencies between which devices were created in the lxc backend and the native backend. It also fixes inconsistencies between wich devices were created and which were allowed. For example, /dev/full was being created but it was not allowed within the cgroup. It also declares the file modes and permissions of the default devices, rather than copying them from the host. This is in line with docker's philosphy of not being host dependent.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 608702b98064a4dfd70b5ff0bd6fb45d2429f45b
Component: engine
2014-05-30 19:21:29 +00:00
e498aa81c8
add support for COPY to docker build
...
This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 180c2a678510a93a442f1bcdb6a47287ec88ccd6
Component: engine
2014-05-29 00:07:52 +03:00
16451e9bb0
Merge pull request #6051 from LK4D4/move_some_build_tests_to_integration_cli
...
Move some build tests to integration cli
Upstream-commit: b904d0af561eab7a1663d20e913c3fd720118a0a
Component: engine
2014-05-27 12:11:42 -07:00
3df190d391
Merge pull request #6000 from cyphar/5619-fix-unsafe-path-resolution
...
Properly handle paths with symlink path components
Upstream-commit: 754797bba7e9e18a94ed73c8f94fa91973e547c3
Component: engine
2014-05-27 12:06:19 -07:00
d887d96ffe
Move entrypoint build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: b25a9b7138e44950bee646c1bcb691a3dd273ea1
Component: engine
2014-05-27 08:36:38 +04:00
ed1a6f580d
Move expose build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 81d16411398c20a7ddc0bbe3e5e1ce0bd95d6519
Component: engine
2014-05-27 08:00:35 +04:00
26be5cc632
Move cmd build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c58991f31a6a2ceaee7a3a327bfbc697b059ff51
Component: engine
2014-05-27 08:00:35 +04:00
966a80b8ce
Move env build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: b05be686ec490ba68de82434f1ecaff01a84fcfa
Component: engine
2014-05-27 08:00:35 +04:00
23e7a90af8
Move relative workdir build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 40630ce4b65755683e496bb7dbf3779b96ec5393
Component: engine
2014-05-27 08:00:35 +04:00
cfeef64a2d
Move user build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 360fb3d4ea192e28a4d2579589cd16954bb959c1
Component: engine
2014-05-27 08:00:34 +04:00
07ea87f779
Move maintainer build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 3dd4c5f49977bb9538ae1c39605895fde69c86ee
Component: engine
2014-05-27 08:00:34 +04:00
ee7d24f0a0
Move volume build test to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 11f7f0bf9b510e09a853a9fd2030a95b72462164
Component: engine
2014-05-27 08:00:34 +04:00
ce6aa0bad5
integration-cli: cp: added symlink-related tests
...
This patch adds cli integration tests for #5619 , which are tests
to ensure that symlinks are kept relative to the container rootfs
(even when a path component).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: ff24a328765335d9bff1babaac4fac6cf4180af6
Component: engine
2014-05-24 11:01:20 +10:00
418706706b
now busybox as nc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0be44d1a0a2dfd70c35367d7ee8383feeab8d3b9
Component: engine
2014-05-23 21:03:52 +00:00
46f785b005
Update ip test to parse new output
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 24872379375dd66518f09b8063698c2d1fb08df9
Component: engine
2014-05-23 13:22:01 -07:00
7dcc66f3df
Update integration tests with --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 581e8e891886e6db387ed27aabda7dd8f1d14174
Component: engine
2014-05-23 11:31:01 -07:00
dae04453b9
adding test for hanging ADD src .
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 1ce5457d57d783d6c61557681970bf0977621e78
Component: engine
2014-05-22 17:28:04 -07:00
456a42e6c9
Merge pull request #5839 from unclejack/improve_build_rm
...
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
2014-05-22 10:54:05 -07:00
d979c2acea
Merge pull request #5859 from philips/append-etc-hosts-not-bind
...
fix(daemon): prepend host /etc/hosts instead of bind mounting
Upstream-commit: 4bb4bf634a0a056ff8fb4186875c004e156f012d
Component: engine
2014-05-21 15:57:59 -07:00
519b053861
integration-cli: fix spelling error in test
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 61ac745d7a7dd192948e0c1cfbdff87af7715c92
Component: engine
2014-05-21 15:20:29 -07:00
8fa886baf3
integration-cli: tests for /etc/hosts and net=host
...
Some basic tests to make sure this is acting correctly on machines.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 5579bec47be6279569e69c72cccf87864af481de
Component: engine
2014-05-21 15:20:29 -07:00
7594078fbe
for perms checking tests, create files from Go and remove them from git
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: bb431a719008ae183179d9d71090bd1224d61480
Component: engine
2014-05-21 11:35:12 -07:00