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

5521 commits

Author SHA1 Message Date
Alexandr Morozov
b83fc07d88 Not fail on updating parent links 
Fixes #8796

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-11-06 15:30:23 -08:00
Alexandr Morozov
734419e9c7 Merge pull request #8711 from duglin/Issue8160 
Add import/pull events to the stream
 2014-11-06 14:29:02 -08:00
Doug Davis
ef7415258b Add import/pull events to the stream 
Closes #8160

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-06 12:12:41 -08:00
Michael Crosby
546884fd20 Merge pull request #8977 from LK4D4/vet_fixes 
Fix vet errors
 2014-11-06 11:59:05 -08:00
Doug Davis
69a5b827dc See #8379 - if the container doesn't start I added code to make sure that if no other processing sets the container.exitCode to a non-zero value when we make sure its done before we return. I also made sure that while trying to start the CMD/ENTRYPOINT, if it fails, then we set the container.exitCode to the exitStatus from the exec(). 
Closes #8379

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-05 18:23:42 -08:00
Erik Hollensbe
165624062e Close stdin after execution with docker exec -i 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-11-05 15:12:24 -08:00
Alexandr Morozov
18d9f1978b Fix vet errors 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-11-05 08:26:22 -08:00
Alexandr Morozov
9eb8fcd58a Merge pull request #8390 from MalteJ/set-macaddress 
Adding docker-cli run param to set MAC address
 2014-11-04 07:54:59 -08:00
Tibor Vass
b8ab729ae6 Merge pull request #8590 from jfrazelle/8307-iptables-d-restart-fix 
On daemon shutdown iptables cleanup successfully
 2014-11-03 18:29:51 -05:00
Tibor Vass
a85f58719f Merge pull request #8739 from duglin/CleanupDockerIgnores 
Do some cleanup on .dockerignore paths
 2014-11-03 16:05:24 -05:00
Alexandr Morozov
03ea2166b6 Fix deadlock in ps exited filter 
Fixes #8909

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-11-03 10:51:03 -08:00
Malte Janduda
971fc2253a enhancing set-macaddress docu 
Signed-off-by: Malte Janduda <mail@janduda.net>
 2014-11-03 11:43:27 +01:00
Doug Davis
c0f0f5c988 Do some cleanup on .dockerignore paths 
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
    "exclude".  While this isn't causing an issue right now, I got worried
	that in the future some code later on might interpret "" as something bad,
	like "everything" or ".".  So I added a check for an empty "exclude"
	and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
    However, if they put "./foo" then we won't due to the painfully
	simplistic logic of go's filepath.Match algorithm.  To help things
	a little (and to treat ./Dockerfile just like Dockerfile) I added
	code to filepath.Clean() each entry in .dockerignore.  It should
	result in the same semantic path but ensure that no matter how the
	user expresses the path, we'll match it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-02 11:29:46 -08:00
Malte Janduda
f2df38050e Adding docker-cli run param to set MAC address 
Signed-off-by: Malte Janduda <mail@janduda.net>
 2014-11-01 15:35:09 +01:00
Srini Brahmaroutu
fd774a818c adding support for port ranges on --expose 
Closes #1834

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-10-31 23:06:30 +00:00
Tonis Tiigi
c2cf97a074 Fix panic on slow log consumer. 
Fixes #8832

All stdio streams need to finish writing before the
connection can be closed.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-30 22:24:57 +02:00
Tonis Tiigi
417e48e4a0 Generalize consumeSlow and add stop support 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-30 21:11:33 +02:00
Tonis Tiigi
8a81c46272 Move consumeSlow() under test utils 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-30 20:55:08 +02:00
unclejack
73057168fa Merge pull request #8046 from vbatts/vbatts-archive_preserve_hard_links 
archive: preserve hardlinks in Tar and Untar
 2014-10-29 22:04:23 +02:00
Vincent Batts
f9f8044363 archive: preserve hardlinks in Tar and Untar 
* integration test for preserving hardlinks

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2014-10-29 14:52:52 -04:00
Jessie Frazelle
f936a10d80 Merge pull request #8571 from ncdc/3631-stdout-premature-eof 
Fix stdout premature EOF
 2014-10-29 11:36:32 -07:00
Jessica Frazelle
d98b117962 Add test for #8307. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-29 10:59:20 -07:00
Erik Hollensbe
24545c18c3 builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-27 21:50:22 +00:00
Erik Hollensbe
4e74cd498b builder: whitelist verbs useful for environment replacement. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-27 17:38:25 +00:00
Erik Hollensbe
be49867cab builder: handle escapes without swallowing all of them. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-27 17:38:24 +00:00
Tibor Vass
350e1b783d Merge pull request #8321 from erikh/ui_save_output 
docker save: Do not save to a terminal.
 2014-10-24 19:37:14 -04:00
Alexandr Morozov
c681bea062 Merge pull request #8744 from erikh/empty_entrypoint_inheritance 
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
 2014-10-24 15:31:15 -07:00
Jessie Frazelle
9094c19a6d Merge pull request #8315 from dqminh/save-start-error 
Save start error into State.Error when the container fails to start
 2014-10-24 13:13:00 -07:00
Erik Hollensbe
cdd6e97910 builder: some small fixups + fix a bug where empty entrypoints would not override inheritance. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-24 00:23:25 +00:00
Victor Vieux
a71b2ec54a Merge pull request #8737 from brahmaroutu/resize_uponstart_8728 
Allowing resize tty to only work when container is started
 2014-10-23 17:20:10 -07:00
Srini Brahmaroutu
78a272ce14 Allowing resize tty to only work when container is started 
Addresses #8728

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-10-23 21:31:34 +00:00
Phil Estes
1262b5f605 Gracefully handle network bridge without IP association at startup 
Addresses #8444

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-10-23 16:19:12 -04:00
Alexandr Morozov
77dcab133c Merge pull request #8735 from estesp/fix-test-timeout-on-drone 
Up test timeout to 10s based on recent drone.io timeout failures
 2014-10-23 13:02:34 -07:00
Phil Estes
ee17b93df9 Up test timeout to 10s based on recent drone.io timeout failures 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-10-23 14:30:39 -04:00
Phil Estes
6589044b5b Fix volume test using "find" to properly call find with /hello path 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-10-23 14:13:11 -04:00
Daniel, Dao Quang Minh
fb6ee865a9 save start error into State.Error 
when a container failed to start, saves the error message into State.Error so
that it can be retrieved when calling `docker inspect` instead of having to
look at the log

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-10-22 22:42:37 -04:00
Jessica Frazelle
93e17b2eca TestRunRedirectStdout kept failing with timed out. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-22 15:51:14 -07:00
Andy Goldstein
5572dbb750 Fix stdout premature EOF 
Never close attached stream before both stdout and stderr have written
all their buffered contents. Remove stdinCloser because it is not needed
any more as the stream is closed anyway after attach has finished.

Fixes #3631

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2014-10-22 16:34:42 -04:00
Tibor Vass
47cb56f20f Merge pull request #8691 from crosbymichael/fix-integration-race 
Fix racy integration tests
 2014-10-21 21:06:01 -04:00
Michael Crosby
95d1cd0bde Merge pull request #8661 from estesp/8555-start-exit-code 
Return container exit code with start -a/-i
 2014-10-21 16:22:15 -07:00
Michael Crosby
ba5370c116 Fix racy integration tests 
Do not run containers in the background in the integration tests if you
depend on the run completing.  It is better especially if you just want
to ensure that the run has completed with a `true` to just run in
foreground and use a known name for the container to query it after it
has stopped.

The failures can be reproduced on most machines by giving your dind
container one core and a cpushare.

docker run -c 200 --cpuset 0 -ti --rm --privileged -e
DOCKER_GRAPHDRIVER=vfs docker hack/make.sh binary test-integration-cli

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-21 22:51:09 +00:00
Erik Hollensbe
a34831f016 builder: handle cases where onbuild is not uppercase. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-21 20:17:37 +00:00
Tibor Vass
cf44d6f9cc Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes 
Clean volume paths
 2014-10-21 11:17:03 -04:00
Victor Vieux
a10876d355 Merge pull request #8573 from estesp/integration-test-migrate 
Migrate container GET API tests from integration to integration-cli
 2014-10-20 18:06:40 -07:00
Brian Goff
ef98fe0763 Make container.Copy support volumes 
Fixes #1992

Right now when you `docker cp` a path which is in a volume, the cp
itself works, however you end up getting files that are in the
container's fs rather than the files in the volume (which is not in the
container's fs).
This makes it so when you `docker cp` a path that is in a volume it
follows the volume to the real path on the host.

archive.go has been modified so that when you do `docker cp mydata:/foo
.`, and /foo is the volume, the outputed folder is called "foo" instead
of the volume ID (because we are telling it to tar up
`/var/lib/docker/vfs/dir/<some id>` and not "foo", but the user would be
expecting "foo", not the ID

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-10-20 20:23:01 -04:00
Brian Goff
964f9965c7 Clean volume paths 
Fixes #8659

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-10-20 19:07:56 -04:00
Tibor Vass
af52f8edcf Merge pull request #8638 from LK4D4/fix_8632 
Don't write pull output to stdout on container creating
 2014-10-20 18:10:47 -04:00
Alexandr Morozov
52784c09b7 Merge pull request #8543 from brahmaroutu/filter_containers_7599 
Adding capability to filter by name, id or status to list containers api
 2014-10-20 15:04:24 -07:00
Michael Crosby
b90ab68f2a Merge pull request #8511 from coolljt0725/fix_tag 
Fix tag an existed tag name of a repository
 2014-10-20 14:32:23 -07:00
Srini Brahmaroutu
1634625353 Adding capability to filter by name, id or status to list containers api 
Closes #7599

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-10-20 18:33:20 +00:00