beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12176 commits 14 branches 412 tags 338 MiB
Commit graph

374 commits

Author SHA1 Message Date
Michael Crosby
ce08083f9c Merge branch 'master' into add-libcontainer 
Conflicts:
	execdriver/termconsole.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-26 12:55:24 -08:00
Victor Vieux
5908aa350d Merge pull request #4357 from creack/fix_TestCmdKill 
Fix TestCmdKill by closing the pipe before waiting on the container
 2014-02-26 12:20:30 -08:00
Guillaume J. Charmes
4039fbb1b0
Fix TestCmdKill by closing the pipe before waiting on the container 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-25 20:16:17 -08:00
Victor Vieux
8dad771daa add version pkg 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:38 +00:00
Victor Vieux
964d82d005 fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:08 +00:00
Victor Vieux
795ed6b1e5 Rewrite docker rmi 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:07 +00:00
Michael Crosby
de083400b8 Address initial feedback from pr 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-25 10:54:41 -08:00
Michael Crosby
431d510cae Remove container env var from libcontainer 
Update tests to use native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-24 21:51:00 -08:00
Michael Crosby
27a43692c2 Merge branch 'master' into add-libcontainer 
Conflicts:
	runtime.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-24 20:35:12 -08:00
Michael Crosby
a76407ac61 Cgroups allow devices for privileged containers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-24 15:47:23 -08:00
Michael Crosby
cfd188e925 Add info for driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-24 14:11:09 -08:00
Michael Crosby
01f9815b55 Fix tests with dockerinit lookup path 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-24 13:40:17 -08:00
Solomon Hykes
92c3927b5d Cleanup integration tests 
Refactor integration tests to remove special cases in the creation of
test engines. All test engines are now created through newTestEngine.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-24 19:24:30 +00:00
unclejack
b829e96cde forbid chained onbuild, from & maintainer triggers 
This changes the way onbuild works:
- forbids the chaining of onbuild instructions
- forbids the use of `onbuild from`
- forbids the use of `onbuild maintainer`

It also makes docker throw errors when encountering such triggers when
executing the triggers during `FROM`.

Three tests have been added:
- ensure that chained onbuild (`onbuild onbuild`) is forbidden
- ensure that `onbuild from` is forbidden
- ensure that `onbuild maintainer` is forbidden

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-20 20:31:04 +02:00
Victor Vieux
4187f4e750 Merge pull request #4168 from crosbymichael/add-listenbuffer 
Hold connections until the daemon has fully loaded
 2014-02-17 16:04:49 -08:00
unclejack
f3ff190491 Merge pull request #4131 from tianon/vendor-golang-xattrs 
Add vendored archive/tar that includes xattrs patch
 2014-02-17 21:12:28 +02:00
Michael Crosby
bc286d651d Merge pull request #4172 from fabiofalci/test_save_and_load 
Test for save and load commands
 2014-02-17 13:52:44 -05:00
Tianon Gravi
b762d3a739 Add vendored archive/tar that includes xattrs patch 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-17 08:20:21 -07:00
Fabio Falci
4ab3c31b15 Test for save and load commands 
Improve test for save to tar and load from tar commands.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-02-17 01:52:50 +00:00
Fabio Falci
a51441278a docker cp error when container doesn't exist 
Fix cp api to return a 404 notfound if container doesn't exist.
Fixes #4119.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-02-16 15:49:36 +00:00
Michael Crosby
778f1bf663 Integration generic socket wait for docker api 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-15 20:49:50 -08:00
Solomon Hykes
ee59ba969f Move remote api client to api/ 
This moves `commands.go` out of the core and into `api/client.go`

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-15 14:55:51 -08:00
Solomon Hykes
9b56da78e0 Refactor utility MkBuildContext to the more generic archive.Generate 
This facilitates refactoring commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-15 14:52:08 -08:00
Alexander Larsson
f198ee525a Properly close archives 
All archive that are created from somewhere generally have to be closed, because
at some point there is a file or a pipe or something that backs them. So, we
make archive.Archive a ReadCloser. However, code consuming archives does not
typically close them so we add an archive.ArchiveReader and use that when we're
only reading.

We then change all the Tar/Archive places to create ReadClosers, and to properly
close them everywhere.

As an added bonus we can use ReadCloserWrapper rather than EofReader in several places,
which is good as EofReader doesn't always work right. For instance, many compression
schemes like gzip knows it is EOF before having read the EOF from the stream, so the
EofCloser never sees an EOF.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-02-14 13:46:17 +01:00
Solomon Hykes
6393c38339 Move the canonical run configuration objects to a sub-package 
* Config is now runconfig.Config
    * HostConfig is now runconfig.HostConfig
    * MergeConfig is now runconfig.Merge
    * CompareConfig is now runconfig.Compare
    * ParseRun is now runconfig.Parse
    * ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
    * ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob

This facilitates refactoring commands.go and shrinks the core.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-11 20:18:46 -08:00
Victor Vieux
9a9690360c Merge pull request #4074 from shykes/separate-version 
Move docker version introspection to a sub-package.
 2014-02-11 20:16:00 -08:00
Tianon Gravi
0d871840b2 Fix the tests, too 
Seriously.  There's not much codebase left we haven't touched.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-11 19:10:23 -07:00
Solomon Hykes
3ecd8ff0c8 New package nat: utilities for manipulating the text description of network ports. 
This facilitates the refactoring of commands.go

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-11 16:51:01 -08:00
Victor Vieux
2dcb48af0f Merge pull request #3524 from tianon/supplementary-groups 
Add supplementary groups lookup in sysinit
 2014-02-10 14:42:14 -08:00
Solomon Hykes
ded9e0d6df builder: clearly display ONBUILD triggers during a build. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-04 19:11:56 +00:00
Solomon Hykes
9f994c9646 New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-04 01:31:19 +00:00
Johan Euphrosine
92e61f89aa docker/config: update -mtu flag default 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)
 2014-02-03 15:36:39 -08:00
Tianon Gravi
e8963748fc Consolidate a bunch of the supplementary-groups tests to cut down on the number of RUN lines in a single Dockerfile within TestBuild 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-31 20:15:24 -07:00
Tianon Gravi
ee93f6185b Move UserLookup functionality into a separate pkg/user submodule that implements proper parsing of /etc/passwd and /etc/group, and use that to add support for "docker run -u user:group" and for getting supplementary groups (if ":group" is not specified) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-31 20:15:24 -07:00
Victor Vieux
a446b34719 Merge pull request #3832 from jlhawn/3831-auth-tests-server-address 
Prevent Tests from creating users on Prod Index
 2014-01-31 18:34:13 -08:00
Guillaume J. Charmes
819c2e3eca Merge pull request #3872 from crosbymichael/network-driver 
Remove networking out of core and into a driver
 2014-01-31 17:22:37 -08:00
Michael Crosby
6a1ee89d2d Merge pull request #3827 from vieux/mova_api_package 
Move api into sub package
 2014-01-31 15:39:33 -08:00
Victor Vieux
9eea7f28f0 Move serveapi to api/api.go 
Remove api import from server.go
Rename initapi to init server

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 23:06:00 +00:00
Michael Crosby
49b9813035 Fix integration tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-01-31 12:04:44 -08:00
Michael Crosby
53ee1daa69 Merge pull request #3841 from alexlarsson/separate-base-fs 
Separate out graphdriver mount and container root
 2014-01-31 11:49:14 -08:00
Victor Vieux
b881a6c3c2 merge master 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 19:00:06 +00:00
Victor Vieux
51d280f944 merge master 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 18:43:34 +00:00
Michael Crosby
643c7dc25d Merge pull request #3829 from vieux/fix_api_regression 
Fix ID -> Id api
 2014-01-31 10:38:57 -08:00
Victor Vieux
2b52d6e801 Remove api_params.go 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 03:59:14 +00:00
Victor Vieux
fc2f998822 remove some mkServerFromEngine 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 03:34:50 +00:00
Alexander Larsson
fab19d197c Separate out graphdriver mount and container root 
This separates out the directory as returned from the graphdriver (the
"base" fs) from the root filesystem of the live container. This is
necessary as the "diff" operation needs access to the base filesystem
without all the mounts that the running container needs (/.dockerinit,
volumes, etc).

We change container in the following way:

Container.RootfsPath() returns the the directory which will be used as
the root in a running container. It is always of the form
"/var/lib/docker/container/<id>/root" and is a private bind mount to
the base filesystem. It is only available while the container is running.

Container.BasefsPath() returns the raw directory from the graph driver
without the container runtime mounts. It is availible whenever the
container is mounted (in between a container.Mount()/Unmount() pair,
which are properly refcounted).

This fixes issue #3840

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-01-30 16:43:53 +01:00
Josh Hawn
c914abaf15 Prevent Tests from creating users on Prod Index 
The integration tests had previously used the environment variable
DOCKER_INDEX_URL but it was apparently removed several months ago.

Change the integration auth tests to specify the ServerAddress field
of the AuthConfig struct to use the staging deployment of the index.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2014-01-29 17:18:11 -08:00
Victor Vieux
5b82a1b726 add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-30 00:55:29 +00:00
Victor Vieux
54072dbbd6 fix ID -> Id api 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-29 20:31:49 +00:00
Victor Vieux
f556cd4186 move api to it's own package 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-29 19:26:54 +00:00
Victor Vieux
217ad5e5e6 Remove api_params.go 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-29 18:52:54 +00:00
Fabio Falci
1ee1dc2340 Improve test for container list ps 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-01-26 23:14:50 +00:00
Victor Vieux
5ea2986ce5 Move containers to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 16:07:42 -08:00
Victor Vieux
f41e0cf048 fix error handling 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 14:59:46 -08:00
Victor Vieux
564e6bc780 Move docker rmi to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 14:55:11 -08:00
Victor Vieux
9dcbdbc4b1 move pull and import to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 14:46:31 -08:00
Michael Crosby
2a6e93a6fb Merge pull request #3558 from tianon/buildfile-run-json 
Add support for RUN [""] in Dockerfiles
 2014-01-22 11:51:34 -08:00
Guillaume J. Charmes
f61a91f50a Merge pull request #3073 from alexlarsson/refcount-driver-mounts 
Refcount driver mounts
 2014-01-22 11:42:17 -08:00
Guillaume J. Charmes
44a0bab304 Merge pull request #3712 from plietar/kill-signal 
Add a -s option to the kill command to specify a signal.
 2014-01-22 11:38:16 -08:00
Michael Crosby
639d2ecd4f Merge pull request #3682 from alexlarsson/implement-tar 
Implement tar in Go
 2014-01-22 11:23:47 -08:00
Paul Lietar
1f75a0bf43 Add a --signal option to the kill command to specify a signal. 
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net> (github: plietar)
 2014-01-22 06:10:52 +00:00
Michael Crosby
0b789ca844 Merge pull request #3706 from creack/fix_wait_stopped 
Fix wait on stopped container (after docker restart) + add Unit test for that case
 2014-01-21 17:03:35 -08:00
Guillaume J. Charmes
0376a69cb1
Fix wait on stopped container (after docker restart) + add Unit test for that case 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-21 16:49:24 -08:00
Victor Vieux
e3461bc8d6 switch back to the valid json format 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-21 15:06:23 -08:00
Alexander Larsson
191aa17d16 Remove container.EnsureMounted 
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-01-21 11:26:11 +01:00
Alexander Larsson
bcaf6c2359 Add Put() to graphdriver API and use it 
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-01-21 11:25:37 +01:00
Alexander Larsson
bde2d3aef7 integration: Fix TestGetContainersExport 
The tar changes made the name of the file in the tar archive
change from  "./test" to "test", update the test to the new name.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-01-21 10:41:08 +01:00
Jake Moshenko
6e6ff85362 Fix support for registry auth with Dockerfile build. 
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
 2014-01-20 18:35:14 -05:00
Michael Crosby
93ead2fe78 Update with lxc unconfined changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-01-17 17:42:22 -08:00
Victor Vieux
90ec5de430 move changes to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-15 17:13:45 -08:00
Victor Vieux
0fb8a55753 move insert to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-15 14:52:58 -08:00
Victor Vieux
7898dca8b3 fix tests & small code improvment 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-15 11:06:00 -08:00
Victor Vieux
3a610f754f Add compat 1.8 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-13 15:50:20 -08:00
Solomon Hykes
17a806c8a0 Port 'docker images' to the engine API 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-01-13 15:49:33 -08:00
Tianon Gravi
fd78128870 Add support for RUN [""] in Dockerfiles for greater specificity in what is actually executed 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-11 04:00:52 -07:00
Victor Vieux
6dde20c0c5 Merge pull request #3180 from vieux/job_container_delete 
Move container_delete to job
 2014-01-10 15:53:38 -08:00
Victor Vieux
ad162b75a0 Merge pull request #3476 from vieux/restart_job 
Move restart to a job
 2014-01-10 15:52:42 -08:00
Victor Vieux
15689b56c8 Move restart to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-10 15:51:48 -08:00
Victor Vieux
aa3339cf39 move container_delete to job 
handle error

remove useless errStr

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
 2014-01-10 15:34:10 -08:00
Guillaume J. Charmes
772765c404 Merge pull request #3510 from creack/hotfix-add_caching 
Hotfix add caching
 2014-01-08 15:00:18 -08:00
Frank Macreery
93ff70a3e7
Potential fix for ADD . 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-08 14:22:24 -08:00
Manuel Woelker
53a01aebd6 Fix for #3345: Add Content-Type Header "application/json" to GET /version and /info responses in remote API 
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
 2014-01-08 09:17:20 +01:00
Guillaume J. Charmes
bb76985d39 Merge pull request #3474 from creack/fix_add_cache_issue 
Fix ADD caching issue with . prefixed path
 2014-01-07 17:24:18 -08:00
Guillaume J. Charmes
f3103e5c91
Fix issue with file caching + prevent wrong cache hit 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-07 16:53:55 -08:00
Guillaume J. Charmes
811341423b
Fix ADD caching issue with . prefixed path 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com> (github: creack)
 2014-01-07 16:02:20 -08:00
Solomon Hykes
7799ae27ca Move utility package 'iptables' to pkg/iptables 2014-01-06 15:41:24 -08:00
Michael Crosby
bb754fd34d Merge pull request #3388 from tianon/more-build-tests 
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
 2014-01-06 15:14:30 -08:00
Brian Goff
323c4b5211 Use same error handling while unmarshalling args for CMD and ENTRYPOINT 2014-01-06 13:15:14 -05:00
Tianon Gravi
c6dcee329d Add more TestBuild Dockerfiles, especially for making sure manual RUN echo '#!...' continues to work correctly 2013-12-30 00:10:48 -07:00
Guillaume J. Charmes
efaf2cac5c Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles 
Issue #880 - cache ADD commands in dockerfiles
 2013-12-24 16:22:51 -08:00
Victor Vieux
e6e35e5984 Merge pull request #3330 from shykes/pkg-term 
Move utility package 'term' to pkg/term
 2013-12-23 16:11:42 -08:00
Solomon Hykes
7ce7516c12 Move utility package 'term' to pkg/term 2013-12-23 23:42:37 +00:00
Victor Vieux
369cde4ad7 discard test output 2013-12-20 16:50:31 -08:00
Gabriel Monroy
c995c9bb91 add TestContainerOrphaning integration test 2013-12-20 16:52:34 -07:00
Michael Crosby
aa619de748 Merge pull request #3289 from crosbymichael/add-mtu-option 
Allow mtu to be configured at daemon start
 2013-12-20 13:21:56 -08:00
Michael Crosby
566ff54d0d Allow mtu to be configured at daemon start 2013-12-20 12:12:03 -05:00
Johannes 'fish' Ziemke
f7ba1c34bb Return error if Dockerfile is empty 2013-12-20 14:13:52 +01:00
Jonathan Rudenberg
c06ab5f9c2 Add container name validation test 2013-12-17 20:19:23 -05:00
Guillaume J. Charmes
d9a1cc7e2b Merge pull request #3168 from discordianfish/2464-replace-lxc-ps 
Reimplement lxc-ps
 2013-12-17 09:06:52 -08:00
Graydon Hoare
15a6854119 Add testcases for ADD caching, closes #880. 2013-12-16 17:36:51 -08:00
Guillaume J. Charmes
47375ddf54 Merge pull request #3230 from crosbymichael/allow-untag 
Allow untag operations with no container validation
 2013-12-16 14:34:56 -08:00
Michael Crosby
62213ee314 Allow untag operations with no container validation 2013-12-16 13:29:43 -08:00
Guillaume J. Charmes
b3ad330782 Merge pull request #3099 from vieux/fix_pull_build 
added authConfig to docker build
 2013-12-16 10:53:10 -08:00
Johannes 'fish' Ziemke
5cfcb05486 Fix and re-enable TestGetContainersTop 2013-12-16 16:01:55 +01:00
Victor Vieux
85b9338205 add GetenvInt64 ans SetenvInt64 2013-12-13 16:29:22 -08:00
Victor Vieux
51e2c1794b move docker info to the job api 2013-12-13 16:15:15 -08:00
Victor Vieux
4b5ceb0f24 use args 2013-12-13 14:29:27 -08:00
Victor Vieux
930ec9f52c move commit to job 2013-12-13 14:19:56 -08:00
Guillaume J. Charmes
aaa1c48d24 Merge pull request #3175 from vieux/engine-job-stop 
Move stop to job
 2013-12-13 14:15:58 -08:00
Michael Crosby
8224e13bd2 Merge pull request #3185 from vieux/job_tag 
Move tag to job
 2013-12-12 17:02:39 -08:00
Victor Vieux
e43ff2f6f2 move tag to job 2013-12-12 11:52:11 -08:00
Guillaume J. Charmes
5b33ae5971 Merge pull request #3145 from vieux/fix_docker_images 
multiple fixed in docker images
 2013-12-12 11:17:19 -08:00
Victor Vieux
6ba456ff87 move t from arg to env 2013-12-11 15:36:50 -08:00
Solomon Hykes
dbe1915fee Engine: new command 'stop' gracefully stops a container. 2013-12-11 11:52:59 -08:00
Michael Crosby
5fd3c8204d Merge pull request #2735 from shykes/engine-job-kill 
New engine command: 'kill'
 2013-12-11 10:35:57 -08:00
Victor Vieux
09d2c2351c Merge pull request #3119 from shykes/engine-version 
Port 'docker version' to the engine API
 2013-12-09 17:35:44 -08:00
Victor Vieux
c618a906a4 fix size in -tree 2013-12-09 17:27:05 -08:00
Victor Vieux
8291f00a0e refactor and fix tests 2013-12-09 16:25:19 -08:00
Solomon Hykes
de35b346d1 Port 'docker version' to the engine API 2013-12-08 07:41:53 +00:00
Solomon Hykes
3569d080af New engine command: 'wait' 2013-12-06 23:05:21 +00:00
Solomon Hykes
2546a2c645 Hack: use new 'kill' command in integration tests 2013-12-06 23:02:27 +00:00
Michael Crosby
25d3db048e Enable engine to take Stderr and Stdout for mocking in tests 2013-12-06 01:18:18 -08:00
Guillaume J. Charmes
ef157cee30 Merge pull request #3074 from crosbymichael/dm-history-calc 
Save layersize on pull
 2013-12-05 14:13:03 -08:00
Michael Crosby
697707e4af Save layersize on pull 
Do not display size and virtual size on the cli.
Only display virtual size on the cli
 2013-12-05 14:03:23 -08:00
Guillaume J. Charmes
797bac2344 Merge pull request #3057 from crosbymichael/test-cpu-share 
Move test cpu shares out of test start
 2013-12-05 13:58:01 -08:00
Victor Vieux
5f55c1aee1 Merge pull request #2966 from andrewsmedina/govet2 
fixed some `go vet` issues.
 2013-12-04 17:57:10 -08:00
Michael Crosby
0d1506adb3 Move test cpu shares out of test start 
Fixes #2107
 2013-12-04 16:31:09 -08:00
Michael Crosby
5976c26c1e Ensure that the init layer is removed with the container 2013-12-03 09:44:48 -08:00
Guillaume J. Charmes
98ed1dc433
Fix unit test with new buildfile prototype 2013-12-02 12:51:37 -08:00
Guillaume J. Charmes
d6cdbca6c1 Merge pull request #2775 from daniel-garcia/2671-bindmount_files 
fixes #2671, add support for bind mounting individual files in to contai...
 2013-12-02 09:30:08 -08:00
Johannes 'fish' Ziemke
b04c6466cd Make docker build return exit code of build step 
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
 2013-12-02 17:52:37 +01:00
Guillaume J. Charmes
2dac7b5209 Merge pull request #2781 from shykes/engine-status-int 
Engine: integer status, better streaming, lots of tests
 2013-11-29 17:57:28 -08:00
Andrews Medina
a6c9a332d0 fixed some go vet issues. 2013-11-29 22:53:20 -02:00
Solomon Hykes
a4f8a2494b Engine: integer job status, improved stream API 
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
 2013-11-30 00:25:46 +00:00
Andrews Medina
fe72f15e4a go fmt. 
result of `gofmt -w -s .` without vendors.
 2013-11-29 22:20:59 -02:00
Guillaume J. Charmes
ab35aef6b5
Add unit test to check bind / server side 2013-11-29 13:43:37 -08:00
Guillaume J. Charmes
bb284ce59d
Merge branch 'master' into fix_tests 2013-11-29 13:17:36 -08:00
Guillaume J. Charmes
34353e782e
Reduce the timeout for restart/stop 2013-11-29 11:08:01 -08:00
Guillaume J. Charmes
86c00be180
Fix behavior of tty tests 2013-11-29 10:17:25 -08:00
Guillaume J. Charmes
2ec1146679
Remove an unit test from integrations test 2013-11-29 10:17:04 -08:00
Guillaume J. Charmes
2e6a958612
Fix TestAttachDetachTruncatedID (behavior + tty issue) 2013-11-29 10:03:36 -08:00
Guillaume J. Charmes
697be6aaa0
Create helper function for tests 2013-11-29 10:02:22 -08:00
Guillaume J. Charmes
63d6cbe3e4
Actually test the detach (was not the case before) 2013-11-29 09:11:20 -08:00
Guillaume J. Charmes
67e9e0e11b
Make the PTY in raw mode before assert test (TestAttachDetach) 2013-11-29 08:29:56 -08:00
Guillaume J. Charmes
e535f544c7
Make sure the container is running before testing against it (TestAttachDetach) 2013-11-29 07:39:51 -08:00
Victor Vieux
926f7b579e Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD 
Add specific feedback for ADD outside context
 2013-11-28 17:55:11 -08:00
Guillaume J. Charmes
ad43d88af5
Make race condition more obvious by performing more asserts 2013-11-28 16:12:45 -08:00
Solomon Hykes
2302293244 Fix a race condition in the integration tests 2013-11-26 05:28:00 +00:00
Solomon Hykes
a937313747 Always use the 'vfs' storage driver in integration tests. To test other drivers, we need a dedicated driver validation suite. 2013-11-26 05:05:15 +00:00
Solomon Hykes
fb3d60f27a Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked. 2013-11-26 05:05:15 +00:00
Sven Dowideit
96b5be9dd9 add more searchable info to the error message when ADD tries to go outside the context 2013-11-23 12:23:31 +10:00
daniel-garcia
0198f8a879 fixes #2671, add support for bind mounting individual files in to containers, rebases of #1757 #2301 2013-11-21 23:40:35 -06:00
Michael Crosby
0cecc2a78c Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	image.go
 2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe 2013-11-21 16:34:58 -08:00
Michael Crosby
2382a0f920 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
 2013-11-20 11:07:42 -08:00
Victor Vieux
304a80fcd5 Merge pull request #2747 from jpoimboe/test-fixes 
Test fixes
 2013-11-20 10:07:40 -08:00
Guillaume J. Charmes
12e993549d
Fix unit-tests 2013-11-19 15:24:14 -08:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master 
Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
 2013-11-19 14:58:12 -08:00
Josh Poimboeuf
4b80ec9aae test: remove extra args in TestExitCode 
The extra blank argument isn't needed and confuses libvirt.
 2013-11-18 15:07:11 -06:00
Josh Poimboeuf
fef41ef7bf test: fix TestRmi race condition 2013-11-18 15:07:06 -06:00
Michael Crosby
4546832507 Merge pull request #2752 from dotcloud/gofmt_test 
Go fmt tests
 2013-11-18 11:34:59 -08:00
Victor Vieux
ed8f75d25c gofmt_test 2013-11-18 11:25:13 -08:00
Darren Coxall
3c67a28493 More informative error message on name collisions 
This is the proposed fix for #2506. It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.

I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
 2013-11-18 17:51:47 +00:00
Josh Poimboeuf
fe302fbfd2 test: 2 second timeout (not 2000) 2013-11-18 10:23:30 -06:00
Josh Poimboeuf
72d02ecdde test: skip TestCreate on Fedora due to lxc utils bug 
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf
baa687bed2 test: fix TestCreateStartRestartStopStartKillRm 
cat needs stdin opened, otherwise it dies immediately.
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf
30ea0bebce test: put each arg in a separate string 
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
 2013-11-18 10:23:06 -06:00
Solomon Hykes
afe230718e Re-enable api integration tests using only public remote API. 2013-11-16 02:12:14 +00:00
Solomon Hykes
823674816e Move iptables test to integration tests 2013-11-15 01:15:39 +00:00
Solomon Hykes
8d3e35cd8d Split auth tests between unit tests and integration tests 2013-11-15 01:13:20 +00:00
Victor Vieux
596810d8db move TestMount to integration 2013-11-14 15:17:31 -08:00
Victor Vieux
661a8a0e0c fix Integration tests 2013-11-14 14:46:13 -08:00
Victor Vieux
c001a5af67 Integration tests: remove dependency on private APIs 2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9 Move integration tests to integration/, expose missing public methods in the core 2013-11-14 10:50:00 -08:00