summaryrefslogtreecommitdiff
path: root/integration
Commit message (Collapse)AuthorAgeFilesLines
* add version pkgVictor Vieux2014-02-251-0/+1
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* fix testsVictor Vieux2014-02-252-1/+2
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* Rewrite docker rmiVictor Vieux2014-02-253-8/+12
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* Cleanup integration testsSolomon Hykes2014-02-243-88/+29
| | | | | | | 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)
* forbid chained onbuild, from & maintainer triggersunclejack2014-02-201-0/+42
| | | | | | | | | | | | | | | | | 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)
* Merge pull request #4168 from crosbymichael/add-listenbufferVictor Vieux2014-02-171-0/+5
|\ | | | | Hold connections until the daemon has fully loaded
| * Integration generic socket wait for docker apiMichael Crosby2014-02-151-0/+5
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
* | Merge pull request #4131 from tianon/vendor-golang-xattrsunclejack2014-02-172-2/+2
|\ \ | | | | | | Add vendored archive/tar that includes xattrs patch
| * | Add vendored archive/tar that includes xattrs patchTianon Gravi2014-02-172-2/+2
| |/ | | | | | | Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* | Merge pull request #4172 from fabiofalci/test_save_and_loadMichael Crosby2014-02-171-0/+71
|\ \ | | | | | | Test for save and load commands
| * | Test for save and load commandsFabio Falci2014-02-171-0/+71
| |/ | | | | | | | | 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)
* | `docker cp` error when container doesn't existFabio Falci2014-02-161-0/+28
|/ | | | | | | 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)
* Move remote api client to api/Solomon Hykes2014-02-151-22/+23
| | | | | | 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)
* Refactor utility `MkBuildContext` to the more generic `archive.Generate`Solomon Hykes2014-02-151-13/+15
| | | | | | This facilitates refactoring commands.go. Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
* Properly close archivesAlexander Larsson2014-02-141-2/+2
| | | | | | | | | | | | | | | | | | 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)
* Move the canonical run configuration objects to a sub-packageSolomon Hykes2014-02-115-88/+92
| | | | | | | | | | | | | | * 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)
* Merge pull request #4074 from shykes/separate-versionVictor Vieux2014-02-112-3/+5
|\ | | | | Move docker version introspection to a sub-package.
| * Fix the tests, tooTianon Gravi2014-02-112-3/+5
| | | | | | | | | | | | 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)
* | New package `nat`: utilities for manipulating the text description of ↵Solomon Hykes2014-02-111-5/+6
|/ | | | | | | | network ports. This facilitates the refactoring of commands.go Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
* Merge pull request #3524 from tianon/supplementary-groupsVictor Vieux2014-02-101-0/+59
|\ | | | | Add supplementary groups lookup in sysinit
| * Consolidate a bunch of the supplementary-groups tests to cut down on the ↵Tianon Gravi2014-01-311-40/+19
| | | | | | | | | | | | number of RUN lines in a single Dockerfile within TestBuild Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| * Move UserLookup functionality into a separate pkg/user submodule that ↵Tianon Gravi2014-01-311-0/+80
| | | | | | | | | | | | 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)
* | builder: clearly display ONBUILD triggers during a build.Solomon Hykes2014-02-041-2/+2
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
* | New build instruction: ONBUILD defines a trigger to execute when extending ↵Solomon Hykes2014-02-041-0/+16
| | | | | | | | | | | | an image with a new build Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
* | docker/config: update -mtu flag defaultJohan Euphrosine2014-02-031-4/+5
|/ | | | Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)
* Merge pull request #3832 from jlhawn/3831-auth-tests-server-addressVictor Vieux2014-01-311-6/+17
|\ | | | | Prevent Tests from creating users on Prod Index
| * Prevent Tests from creating users on Prod IndexJosh Hawn2014-01-291-6/+17
| | | | | | | | | | | | | | | | | | | | 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)
* | Merge pull request #3872 from crosbymichael/network-driverGuillaume J. Charmes2014-01-311-1/+7
|\ \ | | | | | | Remove networking out of core and into a driver
| * | Fix integration testsMichael Crosby2014-01-311-1/+7
| | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
* | | Merge pull request #3827 from vieux/mova_api_packageMichael Crosby2014-01-315-72/+50
|\ \ \ | |/ / |/| | Move api into sub package
| * | Move serveapi to api/api.goVictor Vieux2014-01-313-7/+7
| | | | | | | | | | | | | | | | | | | | | 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)
| * | merge masterVictor Vieux2014-01-313-9/+9
| |\ \ | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
| * \ \ merge masterVictor Vieux2014-01-311-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
| * | | | remove some mkServerFromEngineVictor Vieux2014-01-312-11/+10
| | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
| * | | | move api to it's own packageVictor Vieux2014-01-291-54/+33
| | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
| * | | | Remove api_params.goVictor Vieux2014-01-291-31/+37
| | |_|/ | |/| | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* | | | Merge pull request #3841 from alexlarsson/separate-base-fsMichael Crosby2014-01-311-1/+1
|\ \ \ \ | |_|_|/ |/| | | Separate out graphdriver mount and container root
| * | | Separate out graphdriver mount and container rootAlexander Larsson2014-01-301-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | Merge pull request #3829 from vieux/fix_api_regressionMichael Crosby2014-01-313-9/+9
|\ \ \ | |_|/ |/| | Fix ID -> Id api
| * | fix ID -> Id apiVictor Vieux2014-01-293-9/+9
| |/ | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* | Remove api_params.goVictor Vieux2014-01-311-31/+37
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* | add testsVictor Vieux2014-01-301-0/+24
|/ | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* Improve test for container list `ps`Fabio Falci2014-01-261-0/+114
| | | | Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
* Move containers to a jobVictor Vieux2014-01-242-34/+129
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* fix error handlingVictor Vieux2014-01-241-5/+5
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* Move docker rmi to a jobVictor Vieux2014-01-243-15/+13
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* move pull and import to a jobVictor Vieux2014-01-242-4/+7
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* Merge pull request #3558 from tianon/buildfile-run-jsonMichael Crosby2014-01-221-0/+25
|\ | | | | Add support for RUN [""] in Dockerfiles
| * Add support for `RUN [""]` in Dockerfiles for greater specificity in what is ↵Tianon Gravi2014-01-111-0/+25
| | | | | | | | | | | | actually executed Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* | Merge pull request #3073 from alexlarsson/refcount-driver-mountsGuillaume J. Charmes2014-01-221-1/+2
|\ \ | | | | | | Refcount driver mounts