toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

20395 Commits

Author SHA1 Message Date
Tianon Gravi
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
Lewis Peckover
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
FunkyMonkeyMonk
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
Brandon Philips
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
Barnaby Gray
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
Michael Crosby
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
Michael Crosby
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
ILYA Khlopotov
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
Guillaume J. Charmes
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
Victor Vieux
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
Guillaume J. Charmes
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
Sven Dowideit
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
Wes Morgan
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
Victor Vieux
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
Andy Rothfusz
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
Andy Rothfusz
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
Sven Dowideit
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
Victor Vieux
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
Victor Vieux
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
Brian Goff
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
Victor Vieux
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
Victor Vieux
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
Victor Vieux
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
Josh Hawn
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
Sven Dowideit
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
Michael Crosby
4bb07a86b5 Ensure that ticker does not leak 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 44c3b7133218a66f44cb51b7563b7c0016583eda
Component: engine
 2014-02-27 11:40:25 -08:00
Victor Vieux
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
Andy Rothfusz
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
Michael Crosby
49fbe66f4f Allow child process to live if daemon dies 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fdeea90fc806d8d2cccdc76a6ecb214dd03093ec
Component: engine
 2014-02-27 09:33:36 -08:00
Tianon Gravi
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
Michael Crosby
9c9bdcb0ef Ensure that the container dir is remove on restore 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a115ce797b80a14d268fcd96521cf05d1e1074c1
Component: engine
 2014-02-27 08:28:55 -08:00
Tim Bosse
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
Michael Crosby
02cbc6e6b4 Code review updates 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fb08b8b221a9a722910d63db678ffb5a8f91b517
Component: engine
 2014-02-26 19:21:46 -08:00
Michael Crosby
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
Victor Vieux
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
Michael Crosby
21edb8542e Ensure that loopback devices are mounted inside the conatiner 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7cd224594733e5fa0560cb912e3cf2dcef168370
Component: engine
 2014-02-26 17:21:09 -08:00
robpc
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
Michael Crosby
3258d9a2a3 Make network a slice to support multiple types 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 70820b69ec2b82ab150af9b8829e37843f67f75a
Component: engine
 2014-02-26 14:20:41 -08:00
Michael Crosby
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
Michael Crosby
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
Victor Vieux
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
unclejack
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
unclejack
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
unclejack
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
Brian Goff
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
unclejack
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
unclejack
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
unclejack
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
unclejack
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
unclejack
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