e4fda25225
Merge pull request #4418 from SvenDowideit/mention-expose-in-port-mapping-deprecation
...
make the port mapping deprecation error message more obvious
Upstream-commit: 17577a6dce6508f0c6908a678dee35eb17a5f7e3
Component: engine
2014-03-04 19:44:06 +02:00
91922e3e79
Merge pull request #4438 from crosbymichael/update-docs
...
Update daemon docs for exec drivers
Upstream-commit: 20ddd34d0533ca05e3d09c5d4a8414033d69cfba
Component: engine
2014-03-04 07:56:30 -05:00
5207105b8e
Merge pull request #4415 from iantruslove/patch-1
...
Fix minor typo
Upstream-commit: fbc00df7a0cc500314bd9dd5fca2fe54d011033f
Component: engine
2014-03-03 17:58:03 -08:00
84d85e3b67
Update daemon docs for exec drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0f96a749ab812d76389c4a48c71ff9a01e48488e
Component: engine
2014-03-03 17:43:08 -08: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
e06ddb9508
Merge pull request #4382 from unclejack/fix_symlink_handling
...
handle symlinks for Docker's root dir & TMPDIR
Upstream-commit: d761ebea6f4122bd0592267f2a5fe907a86cd338
Component: engine
2014-03-04 03:23:11 +02:00
abf9a1fe77
make the port mapping deprecation error message more obvious see 4075
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2275c83358986c9f612ebb1915c5d3392319f1f8
Component: engine
2014-03-04 10:45:26 +10:00
207b929d4d
nope, echo -e isn't portable
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4f29836f7158521f31e42ea6dfde6c19cd069715
Component: engine
2014-03-04 10:40:36 +10: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
71633326e7
very minor spelling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2e71adac9f2935abaf17741a440497e7e31388e2
Component: engine
2014-03-04 10:12:12 +10:00
ba4d7c0ac6
it seems on MSWindows MSYS bash, echo n puts a literal \n (not a newline) into the commit message, so lets get more primitive
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 43feb84203d5c0ca3b2cb110a96b3dd0ec3a93df
Component: engine
2014-03-04 10:08:40 +10:00
d1e812bd95
remove warnings from makefile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b9cb95c0a07e421c8cbf83fa79aaedead809c802
Component: engine
2014-03-03 23:32:25 +00:00
111101411b
Merge pull request #4413 from jamtur01/exemption
...
Added documentation (and some cleanup) around small patch exemptions
Upstream-commit: fca4cf6f0aa50f8bac307fa72faca9f137cbb4b5
Component: engine
2014-03-04 09:10:37 +10:00
252c901eb2
Merge pull request #4432 from vieux/fix_warning_as_error
...
fix warning can't docker run
Upstream-commit: 5639b29b78a99d2ddd545f7452b4c155e44143fc
Component: engine
2014-03-03 17:16:25 -05: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
04d68b69ad
handle symlinks for Docker's root dir & TMPDIR
...
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.
It also enables handling symlinks for TMPDIR.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
8b72c046df
Merge pull request #4412 from crosbymichael/fix-env-clobber
...
Don't always just append env vars, replace defaults with ones from confi...
Upstream-commit: aac9542a68ee59c62c2cf15df69f77640113bb95
Component: engine
2014-03-03 22:52:03 +02:00
085a080854
Merge pull request #4385 from khia/json_format
...
Support json output in --format flag of docker inspect
Upstream-commit: 37d0ce42c689d3691824c92db81b9c7c9cd98479
Component: engine
2014-03-03 12:36:47 -08:00
e09257e20a
Factor out finalize namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5465fdf00f3ece165cbd3bb680dcc571e81510dd
Component: engine
2014-03-03 12:15:47 -08:00
b49fc1301e
add warning for deprecatd flags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: bb5ed452241c37ee9f2f3ebd02a2a5e1764334ad
Component: engine
2014-03-03 19:57:05 +00:00
11719ff90c
Update readme to remove .nspid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2f35f8e2a88a378d7ff8eacf5346f9711a59489a
Component: engine
2014-03-03 11:31:37 -08:00
5f84dbf6b9
prevent flag grouping with --
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: cb3d27d01bbf696929b4d77d10e47eca2693e3fa
Component: engine
2014-03-03 19:17:28 +00:00
24df4590b2
Merge pull request #4377 from vieux/fix_4358
...
fix fedora tty with apparmor
Upstream-commit: 23ec7e637c13315ad7efdf5194c3f41e5d5bfa4d
Component: engine
2014-03-03 11:10:09 -08:00
5d5ad8f867
Merge pull request #4321 from vieux/docker_run_-it
...
Add support for docker run -it or docker images -qa
Upstream-commit: 7531f82c70e44ac93d540c380ecfd2a52980f86f
Component: engine
2014-03-03 20:52:10 +02:00
2aae4c5f25
Merge pull request #2 from SvenDowideit/docker_run_-it_docs
...
add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 954a913c1f32c604037c81279afaf15080873447
Component: engine
2014-03-03 18:48:47 +00:00
8138b2b95b
Merge pull request #4398 from philips/fix-socket-activation
...
fix(api): serve until the "acceptconnections" job
Upstream-commit: 690fb50beb9052190982981ec340e3e1e9038391
Component: engine
2014-03-03 10:19:51 -08:00
932c2a4033
Merge pull request #4200 from alexlarsson/fix-fedora-tests
...
Fix fedora tests
Upstream-commit: 62d604a81ecb7d99eda48f86d6671073fd14d34d
Component: engine
2014-03-03 10:54:31 -05:00
d1123e2435
aufs: Skip tests if aufs not supported
...
This makes it possible to pass the rest of the testsuite without aufs in the kernel.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 9e28c3e3f86664ef8f219f11ef19c74a414346a9
Component: engine
2014-03-03 15:11:49 +01:00
c8d0d20361
runtime: Fix unique constraint error checks
...
The sqlite3 version in fedora (3.8) returns a different error string in the unique constraints
failure case than the one in hack/ (3.7). This updates the check to detect both, fixing
one integration check failure on Fedora.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: e8af7fcf6da03da65a379c12c90e6626c31846ae
Component: engine
2014-03-03 15:10:52 +01:00
536d686ec4
bump go to 1.2.1 in the Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4a688d6864e0a42b5300754a077f7c0fd45a0929
Component: engine
2014-03-03 15:09:54 +02:00
47387bf105
Merge pull request #4406 from funkymonkeymonk/voldocs
...
adding note that host-volumes must be defined using absolute paths
Upstream-commit: 37893c3db08eb563af89939ca5f545ddd038f69f
Component: engine
2014-03-02 23:19:09 -05:00
2a093650f7
Merge pull request #4176 from SvenDowideit/how-to-backup-volumes
...
add some info wrt backup and restore of volumes
Upstream-commit: 8f57f771609d33340714e7846e810c1507c971c0
Component: engine
2014-03-02 17:41:39 -05:00
1c9accc818
Fix minor typo
...
Upstream-commit: 3de1d25c11c592510cd1be3c8c2e7fa754305484
Component: engine
2014-03-02 13:32:48 -07:00
69c5fbdfef
Added documentation (and some cleanup) around small patch exemptions
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: b187d7ae41a1f946d536b42108ec082541883d26
Component: engine
2014-03-02 11:43:18 -05:00
1a36965b0f
Merge pull request #4399 from barnybug/fish-completions
...
Add fish shell completions from github.com/barnybug/docker-fish-completion
Upstream-commit: 10137a561c280cd9ba36ffb62bb7696989f4072c
Component: engine
2014-03-02 08:45:09 -07:00
ccaab9867b
mkdir /dev before doing mknod
...
Docker-DCO-1.1-Signed-off-by: Lewis Peckover <lew@lew.io > (github: lewispeckover)
Upstream-commit: 6d55a9d7ceec7f9c114839f9c380321a93291aa5
Component: engine
2014-03-02 14:50:16 +00:00
b706d63e16
adding note that host-volumes must be defined using absolute paths
...
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com > (github: funkymonkeymonk)
Upstream-commit: 3ddfbf68802b7a62dcdefd46decb3f7f6faebabe
Component: engine
2014-03-01 20:43:53 -05:00
d9902b0a95
fix(api): serve until the "acceptconnections" job
...
This fixes a bug that I encountered when using socket activation with
docker 0.8.1. When running the first `docker run` it would return:
"create: command not found".
The root cause was the socket activation code path was starting to
listen before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not
found error.
In log format it looks like this:
```
[/var/lib/docker|9d2e78e9] +job initserver()
2014/03/01 04:05:35 Listening for HTTP on fd ()
[/var/lib/docker|0d71c177] +job create()
create: command not found
[/var/lib/docker|0d71c177] -job create()
[/var/lib/docker|0d71c177] +job acceptconnections()
[/var/lib/docker|0d71c177] -job initserver() = OK (0)
```
To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 8d2226b7e5a5d5334f80d3ec03313fe2cd3210a3
Component: engine
2014-03-01 10:55:36 -08:00
197f474b34
Add fish shell completions from https://github.com/barnybug/docker-fish-completion .
...
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk > (github: barnybug)
Upstream-commit: bf6adf952b573d10d5e2eb1a08e382ea6182a5d0
Component: engine
2014-03-01 17:33:54 +00:00
e441b60c93
Merge pull request #4395 from creack/remove_goroutine_leak_test
...
Make the chan for utils.Go buffered in order to avoid goroutine leak
Upstream-commit: f83482c91885b8980031f44e30d73d6971042601
Component: engine
2014-03-01 10:41:36 -05:00
e8666de768
Don't always just append env vars, replace defaults with ones from config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b02b933c6292c539833c15c15299628ac3360572
Component: engine
2014-03-01 03:46:45 -08:00
9a5ac39c28
Support json output in --format flag of docker inspect
...
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com > (github: khia)
Upstream-commit: e07920f680a829724f617819f0c5715ed9b5194a
Component: engine
2014-02-28 17:34:31 -08:00
48d86198db
Make the chan for utils.Go buffered in order to avoid goroutine leak
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: d3a6ee1e55a53ee54b91ffb6c53ba674768cf9de
Component: engine
2014-02-28 16:35:43 -08:00
6bcf6ed0f5
Merge pull request #4394 from creack/fix_tty_ghost
...
Check if the command exists before dereference
Upstream-commit: 6d6ec5e0051ad081be3d71e20b39a25c711b4bc3
Component: engine
2014-02-28 15:53:27 -08:00
319e82a27b
Check if the command exists before dereference
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 5ec68197056fbb63abba847b61bf447fed955359
Component: engine
2014-02-28 15:39:24 -08:00
40e0f3f694
add some info wrt backup and restore of volumes
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5fde31ba9cca63a6bdf0a11fffa64aa16229ef66
Component: engine
2014-03-01 08:44:01 +10: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
a28a17100c
Merge pull request #4390 from SvenDowideit/spelling-1
...
one ponted out by lukaspustina, and one that I bet I added
Upstream-commit: ba2a042aea3d8bb03b3e09e7eb7c6357c754bea0
Component: engine
2014-02-28 13:39:40 -08:00
d02adb2017
Merge pull request #4319 from jlhawn/docs-docker-io-api
...
Added documentation for docker.io OAuth & Accounts
Upstream-commit: 70d2ca4ed39945fbef2337260b0123bdfabc9561
Component: engine
2014-02-28 13:35:33 -08:00
e7b76315fc
one ponted out by lukaspustina, and one that I bet I added
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b16f46635459b9e6f58a733e39ccb21c767d8e33
Component: engine
2014-03-01 05:12:21 +10:00
