Commit Graph

171 Commits

Author SHA1 Message Date
2199b246f3 Simple additions to TestBuildAddTar
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: fc2631b499ba27350f20e7466f54cb06b5c65079
Component: engine
2014-07-09 13:41:57 +04:00
afb119eb53 Merge pull request #6773 from fabiofalci/restart_tests_to_cli
Move `docker restart` tests to integration cli
Upstream-commit: f91a97256b5773f889f9e2d7a1be53f90c3d0318
Component: engine
2014-07-08 17:44:29 -07:00
4eb22040d9 avoid regression in events test
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
Upstream-commit: 560eb07009d65fbcfb49b2fa8b04a2e3f4d647e8
Component: engine
2014-07-09 00:09:03 +00:00
bbaf2a8ed6 Add test for event limitation
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
Upstream-commit: 46747963b603a5573a0b26dcef407a96757926e7
Component: engine
2014-07-09 00:09:03 +00:00
a8bb2012bc Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events
Add event logs for pause/unpause
Upstream-commit: f0aba1aad4d86c5f4989b40bd27be96d72eab6a2
Component: engine
2014-07-08 15:31:23 -07:00
ff37e700fc Tests for ADD tar
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: cfa4999d695d98f30d942460576d5f9c03a64d92
Component: engine
2014-07-08 15:34:04 -04:00
34644f5fc5 Add event logs for pause/unpuase
Fixes #6856

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e1ec91fc582f10d57025e39f0f7e7d6695f7454e
Component: engine
2014-07-08 15:27:44 -04:00
75cb3255af Merge pull request #6720 from fabiofalci/relax_dns_search
Relax dns search to accept empty domain
Upstream-commit: 170609e36957fc044723789bc66918bd7d189702
Component: engine
2014-07-07 15:12:29 -07:00
5a05ec9b94 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
docker save: fix the 'repositories' file
Upstream-commit: 52c58b9ea09655fdcd143f94d733a91229dd557c
Component: engine
2014-07-07 17:26:52 -04:00
b15cf92d6a docker save: more integration tests
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 600f65b24786d15a382877da4c3ae77d88e252bb
Component: engine
2014-07-07 14:58:27 -04:00
5a10cf09e4 Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli
Moved last build tests to integration-cli
Upstream-commit: 880c98d2d3500a5b694eb4e3a610b6aedf1fa493
Component: engine
2014-07-07 10:53:26 -07:00
3c88fb5533 Moved last build tests to integration-cli
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d4862b7a2d0c3b0641ce6d539eabecee686c794
Component: engine
2014-07-06 15:36:34 +04:00
525592aa62 Relax dns search to accept empty domain
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 804b00cd7d1f084a872211e5043d255c454c8e51
Component: engine
2014-07-04 09:33:53 +01:00
6b22b2d896 Move TestGetImagesByName
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: f337a52a6ec01684c326a827adbe3d0b8b5f1f53
Component: engine
2014-07-03 01:39:08 +02:00
8ae73ea011 Move docker restart tests to integration cli
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 9da6c80533f80060575840e1e2fd80cc11826f7b
Component: engine
2014-07-02 21:56:19 +01:00
bc22b11a74 Merge pull request #6780 from unclejack/tweak_cli_integration_tests
Tweak cli integration tests
Upstream-commit: f357b18ee3550a4214d03c10cfe0bed10d6d0df5
Component: engine
2014-07-02 13:16:26 -04:00
e0255ad153 Merge pull request #6763 from folieadrien/master
Migrate TestGetImagesHistory into unit and CLI test
Upstream-commit: deb57c5144f75dc6e1e73194c86991264048ca4a
Component: engine
2014-07-02 19:44:21 +03:00
977b717fdd integcli: add & use pullImageIfNotExist for pulls
This speeds up the tag cli integration tests by about 20 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: dad476803719ae2e86c703981caef0462e25260c
Component: engine
2014-07-02 18:45:11 +03:00
c1f6739a06 Implement tail for docker logs
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
2014-07-01 23:44:12 +04:00
afd3ebbfd3 updated docs & tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 957c510d729ac3dcbe892b145fb2d9ed766be2ca
Component: engine
2014-07-01 17:10:00 +00:00
ae1f05d70a Pause/freeze containers during commit
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.

Fixes bug: #6267
Fixes bug: #3675

Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
2014-07-01 00:30:21 +00:00
8d0912aa9e make TestRemoveContainerRunning handle signals
This lowers the test execution time by about 5 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 63e28cc363c5f13288335e811f075e2423375b05
Component: engine
2014-06-30 22:25:50 +03:00
bc5606f61f integration cli: add imageExists to docker utils
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: eb1e8e884d92a7086af96663d0c658d838315490
Component: engine
2014-06-30 22:22:29 +03:00
845fae8efc Migrate TestGetImagesHistory into unit and CLI test
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 9a2771eac22950fce43702896052f5187944de6d
Component: engine
2014-06-30 01:31:16 +02:00
b39625ba3c Merge pull request #6721 from LK4D4/integration_test_on_links
Integration cli tests on Links in inspect
Upstream-commit: 3aa75210c4decc0affe2f441d302fbbdec1fbc5c
Component: engine
2014-06-27 13:29:13 -07:00
91359fcf89 Integration cli tests on Links in inspect
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 08182da5d829762366b9bff9cb27b25a010ad1dd
Component: engine
2014-06-27 22:44:13 +04:00
1e5262e71f integcli: add test to ensure -v /:/ isn't allowed
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 38b005ec69e62d93453ac4013fe6bfa2fccebc5d
Component: engine
2014-06-27 19:51:24 +03:00
0892a09088 Merge pull request #6701 from crosbymichael/mount-root
Allow / as source of -v
Upstream-commit: 510f1ba4382dfeafaede4cc4ffd6111e9a60bd7d
Component: engine
2014-06-27 19:03:21 +03:00
3090f44756 Merge pull request #6579 from vieux/dockerignore
Rebased Dockerignore
Upstream-commit: 6e3fe9314801baf9e4d162619fabfca5b61456fa
Component: engine
2014-06-26 21:00:43 -04:00
d3e75544ad Fix sleep command in tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 012091a28f8c2a96ad937f8c84992687e804ab71
Component: engine
2014-06-26 17:09:41 -07:00
a23ad7fc08 Add .dockerignore support
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
2014-06-26 22:49:08 +00:00
cb56a2df49 Allow / as source of -v
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed.  You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: e39b8eade1f42503b6b7217e72eff4c8fdc13cb6
Component: engine
2014-06-26 10:50:18 -07:00
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