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
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
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
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
e110c66b2e
Merge pull request #4379 from vieux/remove_warnings_twice
...
remove WARNING writter twice
Upstream-commit: 142213ade8b91af845489b66bfddb98951a8a3ab
Component: engine
2014-02-28 10:31:25 -08: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
3516355bf5
fix fedora tty with apparmor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 6104f9f9495678549ef8fc5aa716a3cc893add8f
Component: engine
2014-02-28 01:20:10 +00:00
efaa1f688a
fix docker info with lxc 1.0.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f30f823bf50de6581f547aee842286584c4b6990
Component: engine
2014-02-28 00:32:58 +00:00
d41cda6cb2
Updated OAuth docs per arothfusz's comments
...
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: b6a5082bd1cfa297637b38aa6692239a679d97e8
Component: engine
2014-02-27 14:21:24 -08:00
f4bfb3c930
add a little bit mentioning commandline option combinations
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: cdec3297f7f06fb383c1be1aaec67417a2d4c7f9
Component: engine
2014-02-28 08:14:22 +10:00
bc4bf85823
Merge pull request #4369 from tianon/better-archive-tar-vendor-import-path
...
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
Upstream-commit: 31e08fdc96b0719122e57d69b5aeb203f6077b1a
Component: engine
2014-02-27 10:37:38 -08:00
e36ff12382
Merge pull request #4318 from robpc/patch-1
...
Fixed typo in Dockerfile example
Upstream-commit: ce8a7352488ede9e78ab0dde642577b506bf28a1
Component: engine
2014-02-27 10:19:09 -08: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
906ee51aec
Some distributions no longer include MAKEDEV script. Stole this from mkimage-rinse.sh.
...
Docker-DCO-1.1-Signed-off-by: Tim Bosse <taim@bosboot.org > (github: maztaim)
Upstream-commit: 1d82091756a7e5514619ecd676ceaa89acabedef
Component: engine
2014-02-26 22:34:42 -05:00
1796b9151c
Merge pull request #4276 from tianon/json-stream-newlines
...
Add newlines to the JSON stream functions
Upstream-commit: 01dc79b3ea0dcca26acb3c3d6b949084fabd9074
Component: engine
2014-02-26 21:25:42 -05: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
d011a4181c
Fixed typo in Dockerfile example
...
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com > (github: robpc)
The 'true' command is located in /bin not /usr/bin in the busybox image.
Upstream-commit: 1475dafd5204a6df2e69dec5214270020edf5e50
Component: engine
2014-02-26 19:38:51 -05:00
e59e0fe670
Merge pull request #4346 from creack/fix_race_exit_code
...
Fix exit code issue with TTY mode
Upstream-commit: 0e356d49aa3e286645a4ff36430283ca66d7084d
Component: engine
2014-02-26 15:32:01 -05: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
a01a267fdb
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
Upstream-commit: bde192bb80079ad89057a6df5ce676c5b3429901
Component: engine
2014-02-26 21:30:24 +02:00
c5ba66b375
Merge pull request #4282 from ibuildthecloud/jumbo-frames
...
Add MTU to lxc conf to make host and container MTU match
Upstream-commit: 22da8cdc7e862dbc54806dc935f4ef079be22654
Component: engine
2014-02-26 20:11:38 +02:00
1d5826bd31
Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
...
make docker build -rm=true default
Upstream-commit: 31ddc1669250565bdf41bc5329d16eb7e5bd7227
Component: engine
2014-02-26 19:03:59 +02:00
0eecb77d00
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
2014-02-26 11:04:06 -05:00
360444d431
Merge pull request #4308 from vbatts/vbatts-seperate_driver_term
...
seperate out the terminal functions from lxc
Upstream-commit: d8b60cb5929b35d35695708ffb8595bc55d2b37f
Component: engine
2014-02-26 16:58:21 +02:00
e002afd39f
Merge pull request #4342 from vieux/update_maintainers_api
...
update api Maintainers file
Upstream-commit: b8a8c0c686837b63650c58a6d0f76dfb0c7810f4
Component: engine
2014-02-26 16:33:02 +02:00
4e0301e92e
Merge pull request #4316 from tianon/more-lenient-kernel-version
...
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
Upstream-commit: a42ef866ed19fc3bd8d1732ee88458e250e7491f
Component: engine
2014-02-26 16:15:56 +02:00
f86c167e50
Merge pull request #4328 from vieux/fix_4298
...
fix divide by zero error
Upstream-commit: 22861b42ee22239a1e51e5297fe6ccb96e474990
Component: engine
2014-02-26 15:59:52 +02:00
2ca7075e82
Merge pull request #4341 from vieux/fix_content_type_copy
...
fix content-type docker copy
Upstream-commit: 94001dc6c6bfa146978e2a36dbc4bb772e935b04
Component: engine
2014-02-26 15:45:38 +02:00
