af2021955c
Add integration test for xz path issue
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Conflicts:
integration-cli/docker_cli_build_test.go
2014-12-11 16:29:15 -05:00
e4ba82d50e
Add build tests covering extraction in chroot
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-11 16:26:52 -05:00
a57eee2229
integ-cli: add test for links in volumes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-11 16:26:52 -05:00
7496cbbccc
integ-cli: add build test for absolute symlink
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-12-11 16:26:52 -05:00
0e71a48d4e
Add another symlink breakout test
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Conflicts:
integration-cli/docker_cli_build_test.go
2014-12-11 16:26:51 -05:00
0d70ad1c72
Fix race in TestDaemonRestartWithVolumesRefs
...
Sometimes rm begins before process death, but Kill called already after
it, so we get error - no such process.
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-10 20:55:51 -08:00
cfc24769a2
Fix permissions on ADD/COPY
...
Fix a regression introduced in PR#9467 when a single file was added or
copied.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-10 11:09:03 -08:00
67e3ddb75f
Forbid client piping to tty enabled container
...
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-09 14:30:49 -08:00
243a640d3e
Add test for exec tty stdin close
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-09 14:30:49 -08:00
bb24f99d74
Merge pull request #9356 from cc272309126/fix-exec-paused-container
...
Fix the issue that when docker exec a paused container, it will always
2014-12-09 11:01:44 -08:00
64ebffe7b6
Merge pull request #9467 from icecrime/9401-restrict_add_chown_scope
...
Reduce permissions changes scope after ADD/COPY
2014-12-09 10:40:23 -08:00
6743be44ca
Running a container that links to a container with --net host
...
should throw an error.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-08 11:33:18 -08:00
f3cedce360
Reduce permissions changes scope after ADD/COPY
...
Permissions after an ADD or COPY build instructions are now restricted
to the scope of files potentially modified by the operation rather than
the entire impacted tree.
Fixes #9401 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-04 17:16:22 -08:00
5c91bb93a7
Make 'docker build' send non-err output to stdout
...
Right now 'docker build' will send:
Sending build context to Docker daemon
to stderr, instead of stdout. This PR fixes that.
I looked in the rest of api/client/commands.go for other cases
that might do this and only one jumped out at me:
https://github.com/docker/docker/blob/master/api/client/commands.go#L2202
but I think if I changed that to go to stdout then it'll mess people up
who are expecting just the container ID to be printed to the screen and
there is no --quiet type of flag we can check.
Closes #9404
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-12-04 14:06:40 -08:00
1bb02117db
Fix the issue when docker exec a paused container, it will always hang.
...
Add the test case of this issue.
Docker-DCO-1.1-Signed-off-by: Chen Chao <cc272309126@gmail.com> (github: cc272309126)
2014-12-05 03:10:44 +08:00
4ee3a318a1
Run 'go vet' on integration-cli.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-03 18:45:51 -08:00
fa753e67ae
Remove unnessary abstraction deepEqual
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-03 17:52:06 -08:00
02a021119f
Remove unnecessary abstraction nLines
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-03 17:47:28 -08:00
7ba9a18ade
cleanup: remove startCommand function, only used once, and
...
unecessary abstraction.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-03 17:43:26 -08:00
e201d5bcd4
Fix tests with old cmd function.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-03 15:53:19 -08:00
67fda33197
Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create
...
Initialize volumes when container is created
2014-12-03 15:42:09 -08:00
50445e4d0c
Merge pull request #9435 from cpuguy83/9414_fix_exec_api_error_no_cmd
...
Check for no `Cmd` on exec create endpoint
2014-12-02 10:28:44 -08:00
a00a1a1fca
Try other port on any error from Map
...
Sometimes other programs can bind on ports from our range, so we just
skip this ports on allocation.
Fixes #9293
Probably fixes #8714
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-01 16:26:30 -08:00
c8a3d31332
Check for no `Cmd` on exec create endpoint
...
Fixes #9414
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-01 17:54:15 -05:00
8ddb42fbfd
Merge pull request #9378 from LK4D4/change_breakout_detection
...
Change symlink breakout detection logic in archive package
2014-12-01 19:23:18 +02:00
9c5e61c24c
Fixes race condition in test. Closes #9389 .
...
Signed-off-by: Emily Maier <emily@emilymaier.net>
2014-11-28 13:48:50 -05:00
be5bfbe221
Change path breakout detection logic in archive package
...
Fixes #9375
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-28 09:44:47 -08:00
64fd3e89c7
Increase memory limit in test cases
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
2014-11-27 03:22:16 +09:00
8635b0248a
fix where cmd function dne
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-25 18:34:08 -08:00
00c2a8f323
Merge pull request #9208 from duglin/Issue8703
...
Add support for docker exec to return cmd exitStatus
2014-11-25 18:03:51 -08:00
9160e01cef
Merge pull request #8893 from vieux/filter_events
...
Events filtering (daemon side)
2014-11-25 17:52:27 -08:00
90928eb114
Add support for docker exec to return cmd exitStatus
...
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.
Closes #8703
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-25 17:49:25 -08:00
68bc8de111
Test for updating hosts files via links.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-11-25 16:48:36 -08:00
20575d20ba
Break some routines out of the mutable files test for future use
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-11-25 16:46:09 -08:00
f0f0e316aa
fix tests
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-26 00:00:56 +00:00
7fbbd515b1
remove deprecated cmd function in integration-cli
...
Remove deprecated cmd function in integration-cli
and change cmd to dockerCmd in all test files
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2014-11-25 00:32:38 +09:00
d7626e97b6
Merge pull request #9188 from somaopensource/8777-fix
...
Fix for #8777 (continuing PR #9061 )
2014-11-21 17:57:56 -08:00
a5277764ae
Merge pull request #9009 from a-ba/fix-export-repo
...
fix missing layers when exporting a full repository
2014-11-21 15:44:27 -05:00
0f2de5158f
Merge pull request #9261 from unclejack/fix_test_tmp_cleanup
...
fix cleanup of /tmp in tests
2014-11-21 08:48:04 -08:00
ae9bd580af
Make --tlsverify enable tls regardless of value specified
...
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.
Per #9221 - also tweaked the docs to fix a typo.
Closes #9221
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-20 16:09:06 -08:00
9a917e732c
Merge pull request #9174 from dqminh/docker-exec-env
...
Set correct env variables for `docker exec` commands
2014-11-20 13:31:51 -08:00
58b6f31a7a
Merge pull request #8251 from duglin/Issue2333
...
Add support for ENV of the form: ENV name=value ...
2014-11-20 13:12:24 -08:00
7ff3b81054
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:46:48 +00:00
2bceaae423
test case for preserving env in exec session
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-11-20 13:05:37 -05:00
1314e1586f
Add support for ENV of the form: ENV name=value ...
...
still supports the old form: ENV name value
Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \
Closes #2333
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-20 09:54:28 -08:00
db7fded17f
integ-cli: fix cleanup in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-20 19:38:41 +02:00
98307c8fae
integ-cli: fix cleanup in test which mounts tmpfs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-20 19:37:46 +02:00
7c225333f2
Allocate daemon listening ports
...
Mark the daemon listening ports as allocated in the portallocator in
order to prevent containers from exposing this port themselves.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-11-19 23:34:27 -08:00
4deac03c65
Fix for #8777
...
Now filter name is trimmed and lowercased before evaluation for case
insensitive and whitespace trimemd check.
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
2014-11-20 13:36:46 +09:00
739d917d70
Merge pull request #9226 from crosbymichael/container-net-test
...
Add test for --net container:<id>
2014-11-19 17:57:45 -08:00
d4ca9e5cce
Merge pull request #9211 from mtesselH/login
...
Fixed a bug - no panic anymore when logining in without TTY
2014-11-19 17:52:35 -08:00
71209f7579
Add test for --net container:<id>
...
This adds an integration test for checking that the network namespace
fds are the same when a container joins another container's network
namespace.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-19 17:43:04 -08:00
eb3bbde6d1
Merge pull request #9251 from tonistiigi/use-format-logging-functions
...
Fix misuses of format based logging functions
2014-11-19 15:25:42 -08:00
6705477673
Fix misuses of format based logging functions
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-11-19 23:59:02 +02:00
bbb245defe
Fix deleteImages() helper for multiple names
...
Pass every image name as separate argument.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-11-19 23:42:16 +02:00
da3d3b97eb
Make sure integration-cli test clean up
...
Common patterns:
- Multiple images were built with same name but only one cleanup.
- Containers were deleted after images.
- Images not removed after retagging.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-11-19 23:41:46 +02:00
e6fd57b90b
Fixed a bug - no panic anymore when logining in without TTY
...
Fixes #8956
Signed-off-by: Marianna <mtesselh@gmail.com>
2014-11-17 19:41:27 -08:00
17dfa126ba
Merge pull request #9204 from jfrazelle/9056-rmi
...
Fix for rmi throws error "no such id".
2014-11-17 18:08:52 -08:00
a0605107d7
Add test for bug (9056) where rmi -f fails with "no such id".
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-17 15:12:55 -08:00
91fb9b2f5a
Fix the documentation and integration test for container resize
...
Closes #8728
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-11-17 18:38:08 +00:00
2facc04673
Add --log-level support
...
Next steps, in another PR, would be:
- make all logging go through the logrus stuff
- I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see
Closes #5198
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-15 09:00:48 -08:00
7107898d5c
Initialize volumes when container is created
...
Fixes #8942
Current behavior is that volumes aren't initialized until start.
Volumes still need to be initialized on start since VolumesFrom and
Binds can be passed in as part of HostConfig on start, however anything
that's already been initialized will just be skipped as is the current
behavior.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-11-14 11:37:03 -05:00
b37fdc5dd1
fix missing layers when exporting a full repository
...
Therer is a bug in the 'skip' decision when exporting a repository
(`docker save repo`)
Only the layers of the first image are included in the archive (the
layers of the next images are missing)
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>
2014-11-14 14:41:35 +01:00
29be7b439e
add test for exposing large number of ports
...
this test checks if exposing a large number of ports in Dockerfile properly
saves the port in configs. We dont actually expose a VERY large number of ports
here because the result is the same and it increases the test time by a few
seconds
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-11-13 13:08:52 -05:00
497fc8876e
Allow IPC namespace to be shared between containers or with the host
...
Some workloads rely on IPC for communications with other processes. We
would like to split workloads between two container but still allow them
to communicate though shared IPC.
This patch mimics the --net code to allow --ipc=host to not split off
the IPC Namespace. ipc=container:CONTAINERID to share ipc between containers
If you share IPC between containers, then you need to make sure SELinux labels
match.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-11-12 11:29:58 -05:00
1e7ba09b60
add a test case for EXPOSE ports order
...
changing order of EXPOSE ports should not invalidate the cache as the content
doesnt change
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-11-12 09:14:35 -05:00
0cef21cfba
Cleanup some integration-cli output
...
I noticed a few things that were bugging me in the output
of the integration-cli tests.
- one of the tests used println to stdout so we had garage sent to the screen
- some of the test, in their final log message, didn't include the name of
the group/file e.g. daemon - run,iptables was just run,iptables
And yes, I noticed this because I'm anal :-) but also because we should keep
the output of the tests as clean as possible so its easy to spot it when
things go bad.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-11 08:44:32 -08:00
2a517fe103
Merge pull request #8726 from krallin/failed-start-breaks-volumes-from
...
Fix: a failed Start() breaks --volumes-from on subsequent Start()'s
2014-11-11 10:49:33 -05:00
84f25414c1
Merge pull request #9014 from LK4D4/fix_parent_failing
...
Not fail on updating parent links
2014-11-10 12:53:16 -08:00
4fcd3dd748
Merge pull request #8716 from duglin/Issue8331
...
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
2014-11-10 13:03:57 -07:00
fb62e18441
Fix: Failed Start breaks VolumesFrom
...
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).
Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.
The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.
Fixes : #8726
Signed-off-by: Thomas Orozco <thomas@orozco.fr>
2014-11-10 17:32:16 +01:00
2e482c86bc
Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present
...
Closes #8331
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-07 13:58:05 -08:00
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
734419e9c7
Merge pull request #8711 from duglin/Issue8160
...
Add import/pull events to the stream
2014-11-06 14:29:02 -08:00
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
546884fd20
Merge pull request #8977 from LK4D4/vet_fixes
...
Fix vet errors
2014-11-06 11:59:05 -08:00
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
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
18d9f1978b
Fix vet errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-11-05 08:26:22 -08:00
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
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
a85f58719f
Merge pull request #8739 from duglin/CleanupDockerIgnores
...
Do some cleanup on .dockerignore paths
2014-11-03 16:05:24 -05:00
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
971fc2253a
enhancing set-macaddress docu
...
Signed-off-by: Malte Janduda <mail@janduda.net>
2014-11-03 11:43:27 +01:00
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
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
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
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
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
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
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
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
f936a10d80
Merge pull request #8571 from ncdc/3631-stdout-premature-eof
...
Fix stdout premature EOF
2014-10-29 11:36:32 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
47cb56f20f
Merge pull request #8691 from crosbymichael/fix-integration-race
...
Fix racy integration tests
2014-10-21 21:06:01 -04:00
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
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
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
cf44d6f9cc
Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes
...
Clean volume paths
2014-10-21 11:17:03 -04:00
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
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
964f9965c7
Clean volume paths
...
Fixes #8659
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-20 19:07:56 -04:00
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
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
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
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
c496f24157
Add docker tag tests.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-10-20 11:10:31 +08:00
65edb07065
Return container exit code with start -a/-i
...
Addresses #8555
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2014-10-18 23:00:20 -04:00
c980fe09b7
Add a testcase to make sure we don't squash tabs or convert them to spaces
...
This is in response to @SvenDowideit asking if we had a "tab" testcase
in https://github.com/docker/docker/issues/2315#issuecomment-58133508
I couldn't find one so I'm adding one
Closes #2315
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-17 15:52:48 -07:00
75fd1b614d
Merge pull request #8639 from erikh/fix_escapes
...
builder: fix escaping for ENV variables.
2014-10-17 15:50:37 -07:00
df0e0c7683
builder: fix escaping for ENV variables.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-17 21:47:35 +00:00
3c325f89e5
Merge pull request #8415 from LK4D4/use_logs_in_builder
...
Use logs instead of attach for builder
2014-10-17 13:32:13 -07:00
6f09d064bd
Use logs instead of attach for builder
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 13:20:02 -07:00
93d3c8e71d
Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:58:12 -07:00
98e7608b4c
Rewrite TestBuildCopyDisallowRemote to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:58:12 -07:00
c8a5d56fd7
Rewrite TestBuildCopyEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:48 -07:00
6582ea574c
Rewrite TestBuildCopyWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:30 -07:00
4a029259ff
Rewrite TestBuildCopyDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:07 -07:00
832618afc6
Rewrite TestBuildCopyDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:49 -07:00
24d83afd52
Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:28 -07:00
2248109ff8
Rewrite TestBuildCopySingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:01 -07:00
d41cba6aed
Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:55:34 -07:00
83c5dced10
Rewrite TestBuildCopySingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:55:04 -07:00
e45c92153d
Rewrite TestBuildCopyAddMultipleFiles to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:54:29 -07:00
5a20dc67b0
Merge pull request #8567 from LK4D4/add_log_done
...
Add logDone for TestBuildAddSingleFileToNonExistDir
2014-10-17 11:20:12 -07:00
09ceae5c9c
Merge pull request #8486 from duglin/Issue5701
...
Add failing testcase for single quotes in CMD
2014-10-17 11:11:49 -07:00
ad136e1ae3
Don't write pull output to stdout on container creating
...
Fixes #8632
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:08:53 -07:00
5af7facf18
Cleanup errorOut remove errorOut functions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
66ac7420a9
Cleanup errorOut resp run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
842d4b6b0a
Cleanup errorOut resp log tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
9f52d8e6e7
Cleanup errorOut resp restart tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
6f1c8ff4c4
Cleanup errorOut resp exec tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
eeb0097294
Cleanup errorOut resp pull tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
dd248dee3c
Cleanup errorOut resp in images tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
50c3e7537c
Cleanup errorOut resp in version tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
f013506aad
Cleanup errorOut resp in push tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
764030ec92
Cleanup errorOut resp in top tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
b1e3c9e9cd
Cleanup errorOut resp in build tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
0c87424007
Cleanup errorOut resp in save tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
0e3744ec89
Cleanup errorOut resp in rmi tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
ac24cabd9d
Cleanup errorOut resp in inspect tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:19 -07:00
d33f2bdb11
Cleanup errorOut resp in ps tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:19 -07:00
ef787eb824
Cleanup errorOut resp in search tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:19 -07:00
73eadbc6a1
Cleanup errorOut resp in docker_utils.go
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:16 -07:00
ac62c5439a
Cleanup errorOut resp in diff test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
7d38ae7041
Cleanup errorOut resp in links test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
f7b3a6b292
Cleanup errorOut resp in history test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
b59d5a9dd2
Cleanup errorOut resp in info test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
0faf87598f
Cleanup errorOut resp in kill test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
17842840ec
Cleanup errorOut resp in nat test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
6b858b59ed
Cleanup errorOut resp in create test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
475235ba7e
Cleanup errorOut resp in tag test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
b645df1d39
Cleanup errorOut resp in export test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
88d65cbdf4
Cleanup errorOut resp in port test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
3182ee5c9b
Cleanup errorOut resp in commit test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Cleanup errorOut resp in commit test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
9edf967824
Add failing testcase for single quotes in CMD
...
Closes #5701
This is due to @SvenDowideit comment at: https://github.com/docker/docker/issues/5701#issuecomment-58133541
where he asked for a testcase showing the error case.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-16 14:40:55 -07:00
d8cd8165a9
Migrate container GET API tests from integration to integration-cli
...
An initial start to migration of the API tests from integration to
the integration-cli model.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(github: estesp)
2014-10-16 17:34:28 -04:00
b3cda9fc7e
Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q
...
Cleanup: integration-cli ('%s' with %q)
2014-10-16 13:51:46 -07:00
3893e220e8
Setting iptables=false should propagate to ip-masq=false
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2014-10-16 11:52:14 -07:00
fcfe80f633
Minor fix of tests names
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:47:01 -07:00
fbaa41b5aa
Add logDone for TestBuildAddSingleFileToNonExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:17:41 -07:00
949ab47710
Replace '%s' in test utils
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:38 -07:00
c091397d51
Replace '%s' in run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:19 -07:00
be31a66b7a
Replace '%s' in rm tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:11 -07:00
a44296603f
Replace '%s' in diff tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:01 -07:00
91f33fcaaa
Replace '%s' in create tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:58:35 -07:00
24189b2c36
Fix builder from being over-aggressive on ${}
...
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.
I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).
I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-10-14 00:58:55 -06:00
1150c1639a
builder: ONBUILD triggers were not accurately being executed in JSON cases.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-14 01:59:45 +00:00
72d8d94284
Merge pull request #8497 from aluzzardi/disable-stable-ip
...
Disable stable IPs.
2014-10-09 15:54:33 -07:00
5b8379a434
Disable stable IPs.
...
Stable IPs causes some regressions in the way people use Docker, see GH#8493.
Reverting it for 1.3, we'll enable it back for the next release.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-10-09 15:15:17 -07:00
b66ac6a809
Revert "Fix line delimited JSON response"
...
This reverts commit d2f75a3040
2014-10-09 13:46:21 -07:00
4eb812e042
Merge pull request #8457 from jfrazelle/pr_8455
...
Check /etc/resolv.conf every time for 127.* content
2014-10-08 16:21:14 -07:00
dbe6c6651e
cleanup resolve.conf code
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-08 15:15:51 -07:00
0486bd022e
Merge pull request #8450 from dqminh/fix-proxy-exit
...
dont close proxy's stdout/stderr prematurely
2014-10-08 14:20:33 -07:00
d7bcc099be
Merge pull request #8475 from cpuguy83/fix_create_phantom_volumes_on_container_restart
...
Fixes re-creating volume on (re)start
2014-10-08 13:58:56 -07:00
c985302c5c
Fixes re-creating volume on (re)start
...
When a container is restarted all the volume configs are parsed again.
Even if the volume was already handled in a previous start it was still
calling "FindOrCreateVolume" on the volume repo causing a new volume to
be created.
This wasn't being detected because as part of the mount initialization
it checks to see if the the _mount_ was already initialized, but this
happens after the parsing of the configs.
So a check is added during parsing to skip a volume which was already
created for that container.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-08 16:25:51 -04:00
9acf7c765c
Restore volume refs after daemon restart
...
Volume refs were not being restored on daemon restart.
This made it possible to remove a volume being used by other containers
after a daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-08 14:17:27 -04:00
3b9d88210e
pass extra file to child process as status handler
...
When stdout/stderr is closed prematurely, the proxy's writes to stdout/stderr
(i.e. `log.Errorf/log.Printf`) will returns with EPIPE error, and go runtime
will terminate the proxy when stdout/stderr writes trigger 10 EPIPE errors.
instead of using stdout/stderr as the status handler, we pass an extra file to
the child process and write `0\n` or `1\nerror message` to it and close it
after. This allow the child process to handle stdout/stderr as normal.
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-10-08 12:53:43 -04:00
de32f48e66
Fix Tag Test for longer tags
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-07 19:37:08 -07:00
acd511786e
Test for check /etc/resolv.conf on every docker run for 127.* content.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-07 16:51:51 -07:00
50fa9dffcf
Allow child to overwrite entrypoint from parent
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-07 23:45:35 +00:00
12203e475d
Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions
...
Ignore unknown dockerfile instructions
2014-10-07 14:45:51 -07:00
40cad37f0a
Merge pull request #8341 from unclejack/add_workdir_test
...
add test for workdir env vars and add docs
2014-10-07 14:27:32 +10:00
9fe1dd3103
Add test for ignoring invalid dockerfile instructions
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-06 23:14:25 -04:00
Arnaud Porterie
Cristian Staretu
unclejack
Tibor Vass
Alexandr Morozov
Brian Goff
Michael Crosby
Jessica Frazelle
Doug Davis
cc272309126
Jessie Frazelle
Alexander Morozov
unclejack
Emily Maier
Yohei Ueda
Erik Hollensbe
Victor Vieux
Daehyeok Mun
Vincent Batts
Daniel, Dao Quang Minh
Oh Jinkyun
Michael Crosby
Tonis Tiigi
Marianna
Srini Brahmaroutu
Anthony Baire
Dan Walsh
Thomas Orozco
Malte Janduda
Vincent Batts
Victor Vieux
Phil Estes
Andy Goldstein
Lei Jitang
Tianon Gravi
Andrea Luzzardi
Sven Dowideit