bf0258224f
Merge pull request #4947 from tianon/sig
...
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
Upstream-commit: 7ab66fa694c4be384588cfc2e6c975d325977024
Component: engine
2014-04-01 11:59:44 -07:00
a2ee3725a5
Update test to be consistent
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 7a50f03fa69fb81c27d361333fadbc9cccdd8948
Component: engine
2014-04-01 10:27:10 -07:00
e80bf0c7c4
Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
...
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4cb602afa0a905ceb0cccf49fe142c1c7b62087b
Component: engine
2014-04-01 11:01:07 -06:00
9772d36088
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 185b040e49aa9ab74f8d9254c7ff86b2891e3708
Component: engine
2014-03-31 18:11:53 +00:00
8972e580e1
Merge pull request #4759 from crosbymichael/comments-in-buildfile
...
Strip comments before parsing line continuations
Upstream-commit: 5b9c8607d90c20282eb65b75112f09634bcba277
Component: engine
2014-03-28 11:16:32 +02:00
1861c25cbb
Merge pull request #4880 from tianon/ignore-down-interfaces
...
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
Upstream-commit: 10b7ae39b95d3b4455616e35b407895ebdd55e06
Component: engine
2014-03-28 10:54:11 +02:00
85082e995b
Merge pull request #4873 from crosbymichael/add-internal-symlinks
...
Follow symlinks inside container root for build's ADD
Upstream-commit: 45b43d85ecbffb7aa626c47ef086f09463d8f8f6
Component: engine
2014-03-27 15:46:48 -07:00
f731a44bb1
Merge pull request #4818 from viirya/fix_working_dir_not_dir
...
fix the problem when setting existing file as working dir
Upstream-commit: ba9f9b3c9268a1b201bcb10045da77b135d869d1
Component: engine
2014-03-27 11:41:18 -07:00
ad6fffc689
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
...
This fixes the following, which I've been seeing on all my machines for as long as I can remember:
--- FAIL: TestOnlyLoopbackExistsWhenUsingDisableNetworkOption (0.36 seconds)
container_test.go:1597: Wrong interface count in test container: expected [*: lo], got [1: lo 2: sit0]
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ad3e71d5c7e01dca229d4077cf8b019d8085c33a
Component: engine
2014-03-27 11:06:32 -06:00
6fd95365ed
Strip comments before parsing line continuations
...
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 67af7b3fb0b5e40a435b434c57291cb2989275ce
Component: engine
2014-03-27 02:41:08 +00:00
1c550a00a4
Follow symlinks inside container root for build's ADD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0fb01fd8fe376a3518b1050ab62f2b3370d62535
Component: engine
2014-03-27 02:07:35 +00:00
2ce68073b6
check if working dir is a directory and raise corresponding errors when making dir.
...
Docker-DCO-1.1-Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com > (github: viirya)
Upstream-commit: 293157b8b38dd5ea5fa49d90501cc3c86717da40
Component: engine
2014-03-25 17:47:08 +08:00
a7b2642223
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f1bd79ec97c125148c690d66ebd3ac5ab3f388b2
Component: engine
2014-03-24 12:03:41 +00:00
c2f15d709c
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
2014-03-20 09:10:32 -07:00
d6e39e4b66
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
f7bce0a8cc
fix failing test to use kill instead of stop
...
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4434dcee89f7d0d0239f6b492b24e940cdbafb21
Component: engine
2014-03-19 23:23:45 +02:00
b5c2e757ec
Merge pull request #4691 from tianon/relative-workdir
...
Add proper support for relative WORKDIR instructions
Upstream-commit: 47470d299da4ade08bad4338c4dba4ceffacdce7
Component: engine
2014-03-19 09:57:23 -07:00
1cf125633c
Improve WORKDIR test to cover more edge cases
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c1f492755b8774005b3627da8ee001ee0b2df4eb
Component: engine
2014-03-17 19:42:13 -06:00
3865d7d383
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
2014-03-17 16:07:55 -07:00
73c73fe476
Add failing test case for issue #4681
...
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 53c5b1856d91093fed1c2d3f038d227f5fdef4b8
Component: engine
2014-03-17 22:01:24 +01:00
2f4b69fe2b
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 326f6a4b4d942bf75ecb003e5c0d439bcb9d67cf
Component: engine
2014-03-17 19:17:40 +00:00
8d099b8012
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
2014-03-17 11:41:28 -07:00
742b723fc2
Move graphdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
2014-03-17 11:40:12 -07:00
2dba72a6f7
Add proper support for relative WORKDIR instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 054b85a7b25e46935c0d91f544aac69dc3497468
Component: engine
2014-03-15 14:03:16 -06:00
32c417d5a0
Fix spelling of benchmark test
...
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 5583774e29911bbd42181e8db2ece08761677cf3
Component: engine
2014-03-15 11:38:31 -04:00
de094b3b6d
Merge pull request #4673 from vieux/update_test_TestCreateRmRunning
...
update TestCreateRmRunning
Upstream-commit: 75738b8527f7578f8a18696bc6b49961790414cd
Component: engine
2014-03-14 15:50:27 -07:00
294ad1e10b
update TestCreateRmRunning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 123ebf905367f1da0d9480153d08912d58b721fc
Component: engine
2014-03-14 18:16:14 +00:00
e71ba07505
Update integration tests for server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8cf0b80a7843633018b66a35d9a55f30814a56b6
Component: engine
2014-03-14 09:46:56 -07:00
19c6fcaf73
Merge pull request #4653 from creack/fix_expose_cache
...
Fix expose cache
Upstream-commit: 28a9ff7f2557d88174b46482a5b402c511684cf7
Component: engine
2014-03-14 16:09:13 +02:00
5c034565db
Add unit test for expose cache
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 7b89af2a08b65fac064603cb3b5eb8e091e2c076
Component: engine
2014-03-13 17:06:17 -07:00
1962352375
Merge pull request #4646 from tianon/double-dash
...
Update to double-dash everywhere
Upstream-commit: 212a870734b5be597579e59bfb8758c3b3198144
Component: engine
2014-03-13 15:31:14 -07:00
7a46914030
Don't use separate bind mount for container
...
Since we're not not mounting anything but the base filesystem outside
the container we no longer need the separate bind mount at
/var/lib/docker/container/$id/root in order to see the base filesystem
without extra mounts. So, we drop this and mount (again) the container
root directly at the real basefs mountpoint.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: bf1b27dfcc6c4e049706d7d104e1abc5c330815d
Component: engine
2014-03-13 20:08:29 +01:00
c48adc6929
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
2014-03-13 11:46:02 -06:00
fcd3746eaa
Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit
...
merge existing config when committing
Upstream-commit: db1afee3f023957adf43a4e9a565568e11e81d2d
Component: engine
2014-03-12 17:49:11 -07:00
80fe86e3ee
don't leave empty cidFile behind
...
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: a56d1b93a1a16ac482b5e30773664f2538949c53
Component: engine
2014-03-12 19:36:19 +02:00
4fcd3ec7b6
Merge auth package within registry
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 8d88ea0c15b7ce7fd2b0b695c498a7ffa0f2bc87
Component: engine
2014-03-10 17:16:58 -07:00
060a86aead
Move runtime and container into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 36c3614fdde079fad178390f651945fba884668a
Component: engine
2014-03-09 23:03:40 -07:00
a67c5c76aa
Move graph and tags to graph sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 01b6b2be73a6f40e0179e0217385eea6b41100a5
Component: engine
2014-03-09 22:59:29 -07:00
fc0f37e6e1
Move image into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 82a5439835b0bff3ab3dfb169415948dae504d56
Component: engine
2014-03-09 22:59:29 -07:00
46c0bc2613
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
Upstream-commit: c000cb64712349141596318dea2a8de2462c8f81
Component: engine
2014-03-09 00:06:44 +01:00
fe7e822dde
Merge pull request #4509 from crosbymichael/kill-all
...
Remove the ghosts and kill everything
Upstream-commit: 1695c77c436e65a9f553b365714b56f78891bef5
Component: engine
2014-03-07 01:35:38 +02:00
936f96cce5
Remove the ghosts and kill everything
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 772ef99d2816b629d084e11fe7fba5953687b620
Component: engine
2014-03-06 15:30:26 -08:00
81ffbaf8cc
Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
...
Add ability to force removal of running container via docker rm -f
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
2014-03-07 00:05:57 +02:00
587cb127e7
fix flag deprecation warnings in integration tests
...
This removes three warnings in the integration tests:
Warning: '-viz' is deprecated, it will be removed soon. See usage.
Warning: '-tree' is deprecated, it will be removed soon. See usage.
Warning: '-cidfile' is deprecated, it will be removed soon. See usage.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 35054601d868a82841c220ff474ad47c5d52e871
Component: engine
2014-03-05 16:43:03 +02:00
dc4d93c655
Merge pull request #4327 from crosbymichael/add-libcontainer
...
Add native execution driver to docker and make it the default
Upstream-commit: 69c69059fc3933531e19c05a9d2e831fb713881c
Component: engine
2014-03-03 16:34:20 -08:00
6bcc9e7159
merge existing config when committing
...
Fixes #1141
Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com > (github: cap10morgan)
Upstream-commit: 3b969aad4af430372d5cac1e700f75dba8a38a13
Component: engine
2014-02-28 15:27:05 -07:00
d1105407b3
Add ability to force removal of running container via docker rm -f
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: d78fcb32ffd4736462792407abe734b51b81367a
Component: engine
2014-02-27 23:31:36 -05:00
e3db7f47ed
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2ca4e0ea60851ff8e9c0a05dc13fa23436c529b6
Component: engine
2014-02-27 09:43:44 -07:00
bec84fb562
Merge branch 'master' into add-libcontainer
...
Conflicts:
execdriver/termconsole.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ce08083f9cd23e8f5e44228b0b73884bcf2f3562
Component: engine
2014-02-26 12:55:24 -08:00
fca083e7de
Merge pull request #4357 from creack/fix_TestCmdKill
...
Fix TestCmdKill by closing the pipe before waiting on the container
Upstream-commit: 5908aa350d702bf918b912e70be16898643ccbc3
Component: engine
2014-02-26 12:20:30 -08:00
