2437455209
Merge pull request #6646 from tiborvass/fix-workdir
...
Fix --workdir=/
Upstream-commit: d91b8bcf0b21f7abf23b06872ad960ebd25e733a
Component: engine
2014-06-25 15:19:51 -07:00
4526ee08e7
fix whitespace that precedes the escape in a multiline string.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
2014-06-25 13:39:47 -07:00
2ab25c0f86
add integration test for --workdir=/
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: baacc7006b35badb2e9ba807451ab158936d7832
Component: engine
2014-06-25 11:02:59 -04:00
3325b6e290
fix bug in FollowSymlinkInScope when link == root
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e
Component: engine
2014-06-25 11:02:59 -04:00
d6e6af197e
Fix search integration-cli test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: dd258553b1cbe58d0cb4f8d505aea6f3b1ae6543
Component: engine
2014-06-24 21:16:34 +00:00
403b31a70b
Migrate TestGetEvents into a unit and a CLI test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
Upstream-commit: 1c291ccbbe91b8d8ff3fefb439b20306fd0af2b7
Component: engine
2014-06-24 17:43:26 +02:00
794a8c5ccb
api/client/build: allow tar as context for docker build -
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: edcb41451aa388abe03d4f837ab5ee316a53a030
Component: engine
2014-06-23 13:34:09 -07:00
6f7299924f
Move sorter_test from integration to integration-cli
...
TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 386d1ecc6e2489401aac685eb11da15d21c4b0a7
Component: engine
2014-06-23 22:19:52 +04:00
929a82a086
Merge pull request #6571 from vbatts/vbatts-raw_json
...
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
2014-06-20 23:55:10 +03:00
11e34c9ae0
integration-cli: add build test for NOCACHE
...
This patch adds CLI integration tests to ensure that NOCACHE instructions
in Dockerfiles only apply to direct children of the original image.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: a57298791c882a2a065989b3386b5b14084e8639
Component: engine
2014-06-19 20:33:17 +10:00
20c86625c9
Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path
...
5693 volumes from symlink path
Upstream-commit: 7a0e5991421d423908504531bee7b5dc46443b3f
Component: engine
2014-06-18 16:10:37 -07:00
e2604caa0f
Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug
...
Test and fix history command ordering
Upstream-commit: d803523cdca38f4de61add3bd114373fe4ac0dc7
Component: engine
2014-06-18 14:34:00 -07:00
13250a8dcd
rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_tests folder
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: def86d0cf4d80e037f2ecabdff68bab6652cb741
Component: engine
2014-06-18 15:51:27 -04:00
788ab1fd24
add integration test
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c4c92e66cdb9fa4c141b4fa4872af37037e1bbe2
Component: engine
2014-06-18 15:50:39 -04:00
172faefd3c
Fix go vet errors
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
2014-06-18 17:39:57 +00:00
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
2219ce0d97
add a test using the flags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 6228761f67bb5f2af6c3105de556fa3fedb12069
Component: engine
2014-06-17 01:05:13 +00:00
4126b1978f
improve test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 614c57c52161c0440247a4e4e36808116214770e
Component: engine
2014-06-17 00:59:51 +00: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
ba21a2d751
Add integration test for history command and fix bug where history
...
would occasionally be returned in the incorrect order if sequential
layers had the same created time.
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
Upstream-commit: e827c8ff61a0e71b77bfb7a73c2e45703c1f470a
Component: engine
2014-06-09 10:45:54 -05: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
