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
4be803250c
Remove goroutine leak upon error
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 721562f29685ebf3f3698113cf0ce8000c02e606
Component: engine
2014-03-11 11:39:28 -07:00
85cc4fc5d5
spelling correction
...
s/singal/signal/
Docker-DCO-1.1-Signed-off-by: Dolph Mathews <dolph.mathews@gmail.com > (github: dolph)
Upstream-commit: 18ea183ea0abd18cde0d17e57fc0fa9b19cfab08
Component: engine
2014-03-10 22:17:03 -05:00
11f1b48016
Merge pull request #4563 from creack/signal-improvment
...
Signal improvments
Upstream-commit: b5a544b02e2d6f5e880064f327bcb1d5d866e30e
Component: engine
2014-03-10 17:59:17 -07:00
4189aa7e42
Merge pull request #4567 from creack/merge_auth_registry
...
Merge auth package within registry
Upstream-commit: 7fc4cc0759469274715e36b2a77fb04a6919a431
Component: engine
2014-03-10 17:45:56 -07:00
9db05a87c8
Make docker use the signal pkg with strings
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 157f24ca77a38f7c5c2b22322a2a353d5098a21e
Component: engine
2014-03-10 17:36:47 -07: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
12169c39c1
remove useless lock
...
move job to server and remove version.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 6f70ed3a742162c4cf374a2c2bbd094eed3b043b
Component: engine
2014-03-10 22:14:37 +00:00
6a607918e7
remove utils.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: d648708d02134c3dc6788ad21325224d849b3b8f
Component: engine
2014-03-10 21:06:27 +00: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
a25b16df9e
Move daemon config into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 12bd83182dff24a800eee6e7e93beeab30b480b7
Component: engine
2014-03-09 22:59:28 -07:00
7391576547
Merge pull request #4535 from vieux/fix_string_command
...
fix string in docker images
Upstream-commit: a5c6e08bd61948e973da1d6ffd7b8f55ad44bd22
Component: engine
2014-03-08 17:02:25 +02:00
c65746a97c
fix string in docker images
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: bc086a9cd61b2d15fbef9db3cb53c7f3650fda48
Component: engine
2014-03-07 20:07:17 +00:00
3a9e0a7416
Fix Race when killing the daemon
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: b845ff355a3342ee3fee99196d22194706763182
Component: engine
2014-03-07 11:51:28 -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
f917ba6a35
Merge pull request #4270 from DevTable/fixregistryauth
...
Fix registry auth and remove other hidden ping commands from client code
Upstream-commit: 0eeb146398470bb586ce5b3f1dff28f2f4bbaa4e
Component: engine
2014-03-03 17:34:21 -08:00
4d3778ca3d
fix warning can't docker run
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e23b4e5d15da3e04692ac44370b1945a875206f0
Component: engine
2014-03-03 22:07:42 +00: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
4c2f856d14
Merge pull request #4388 from vieux/fix_eventlisteners_nb
...
fix EventsListeners in docker info
Upstream-commit: 5f5880edb886c6a54867fbd699f3acb250880973
Component: engine
2014-02-28 13:53:15 -08:00
40daa424d6
fix EventsListeners in docker info
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 0ca7df046bec20e86f3df3c7c4391b120c392b07
Component: engine
2014-02-28 19:06:36 +00: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
85a42bc9ac
remove WARNING writter twice
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f67e725e6866f277f706820d4c21b1d0cb2acc80
Component: engine
2014-02-28 02:40:15 +00:00
80c2203352
Merge pull request #4297 from dotcloud/add-simple-checksum
...
registry: Added simple checksums (sha256) for layers
Upstream-commit: 389eba4396b2a7341f7aff25d94577c1a33341b7
Component: engine
2014-02-26 18:15:48 -08:00
2c83e8f464
registry: Fixed unexported field
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
Upstream-commit: a0251223cdd7a52d6ae246d37363b9d78a4d8cc3
Component: engine
2014-02-25 16:06:04 -08:00
5892660f0a
fix bad rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3f6324f0e8e1b4d117a5d22f752e1d5980eea939
Component: engine
2014-02-25 21:08:08 +00:00
dde3a7b467
fix message 'No such image: ubuntu' => 'No such image: ubuntu:latest'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 626cee87f779dff2840b1a31cbe6912545758a9f
Component: engine
2014-02-25 21:08:08 +00:00
a7de7303da
:= / var
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c7f825c0f08e8b6e3cd9dcebc81c21002afcf133
Component: engine
2014-02-25 21:08:08 +00:00
0724fa65be
Rewrite docker rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 795ed6b1e511fa6713fbc9ea4e8569aab15b98ff
Component: engine
2014-02-25 21:08:07 +00:00
28b09e351d
registry: Removed checksumPayload from exported fields
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
Upstream-commit: 522c0765f11569feb1dbc7facfbb802e0f1fb84e
Component: engine
2014-02-24 12:40:33 -08:00
14989a215e
Register built-in engine commands at runtime instead of compile-time
...
This allows selective loading of commands, and paves the way to dynamic
plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 919665a20a41f8e1b105342b1864ec05eb50cc97
Component: engine
2014-02-24 19:24:29 +00:00
f208199d26
registry: Added simple checksums (sha256) for layers
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
Upstream-commit: 8d230cf89cfe3c6c5293d7807c1bffa1cf799d6b
Component: engine
2014-02-23 18:50:04 -08:00
733cdcbf96
Fix registry auth by storing the string passed on the command line, and allowing for credential selection by normalizing on hostname. Also, remove remote ping calls from CmdPush and CmdPull.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
Upstream-commit: 90b0cce07b4f68d8099903f7e1470f79541f45d0
Component: engine
2014-02-20 18:32:33 -05:00
7cfa188a75
update warning about local dns resolvers
...
This changes the local DNS resolver warning to explain what the
warning is about and why the default external DNS server is used.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 85b8025a35c29e0832fd13adc55177758ecbb309
Component: engine
2014-02-17 23:29:36 +02:00
e184f36805
Support submodules when building from a gh repo
...
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io > (github: songgao)
Upstream-commit: c9ae66ffe375156ddf39cb41664224d6e1a6f096
Component: engine
2014-02-17 12:08:23 -06:00
0f43c3eb05
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)
Upstream-commit: 9b56da78e0b1e4e1da9b2bacc44a22143745a2b0
Component: engine
2014-02-15 14:52:08 -08:00
e12f62e6df
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)
Upstream-commit: f198ee525ad6862dce3940e08c72e0a092380a7b
Component: engine
2014-02-14 13:46:17 +01:00
972ffb5ee2
Merge pull request #4073 from crosbymichael/fix-docker-cp-close
...
Ensure docker cp stream is closed properly
Upstream-commit: c6edac9a1a33835e7ab0ea3173877f9731ec45a5
Component: engine
2014-02-13 14:12:53 +02:00
e378922981
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)
Upstream-commit: 6393c38339e11b4a099a460ecf46bb5cafc4283b
Component: engine
2014-02-11 20:18:46 -08:00
9ed97b673b
Move even more stuff into dockerversion
...
Also, use it in all the places. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: da04f49b383c02ee28c32f948048b9e9a402bb4f
Component: engine
2014-02-11 17:26:54 -07:00
a0e7d3fc71
Ensure docker cp stream is closes properly
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 35821ad78f4ad2b20cf839ecc5a73b44c568c5eb
Component: engine
2014-02-11 06:21:53 -08:00
02fa3704fe
Do not ping registry from the cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e2eace9715253b5254d1596f3ee91e2f61127929
Component: engine
2014-02-05 16:49:43 -08:00
386288ab8c
Fix comparing binds and volume ids from other containers
...
Currently comparing volume ids for binds and other containers are broken
Fixes #3749
Fixes #3885
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 720c5774e9a9cd510320a142848832f7cd314da7
Component: engine
2014-02-03 13:18:10 -08:00
47dc263009
Merge pull request #3872 from crosbymichael/network-driver
...
Remove networking out of core and into a driver
Upstream-commit: 819c2e3ecaaa1f82401fe76bae1715183426c3cf
Component: engine
2014-01-31 17:22:37 -08:00
140db53b4e
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)
Upstream-commit: 9eea7f28f0c64d43ef2a9987999a29774fa1476b
Component: engine
2014-01-31 23:06:00 +00:00
0b250038dd
Update core calls to network drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c712e74b45005e0f38297d254fb606aa18606d11
Component: engine
2014-01-31 12:04:44 -08:00
32d36c4ba5
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b881a6c3c2e73f2fd342975239331004f0b59e12
Component: engine
2014-01-31 19:00:06 +00:00
236fdd833b
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 51d280f944eab386ecd67acd6a1878de7b45c8d6
Component: engine
2014-01-31 18:43:34 +00:00
4ca789745b
Merge pull request #3829 from vieux/fix_api_regression
...
Fix ID -> Id api
Upstream-commit: 643c7dc25df4759c1894ba2ff3aa71fe11a06ea4
Component: engine
2014-01-31 10:38:57 -08:00