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

6638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack
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
James Turnbull
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
Andy Rothfusz
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
Michael Crosby
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
Guillaume J. Charmes
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
unclejack
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
Sven Dowideit
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
Tianon Gravi
4a0a6ccc48 Merge pull request #4437 from SvenDowideit/tweak-DCO-hook-for-windows 
Replace `echo -e` with the portable `{ echo; echo ...; }`
Upstream-commit: 52d212aa6eb004de410a14df5f6c49f9c3a93f61
Component: engine
 2014-03-03 17:43:37 -07:00
Sven Dowideit
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
Guillaume J. Charmes
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
Michael Crosby
359b89f779 Merge pull request #12 from SvenDowideit/add-libcontainer-minor-doc-tweak 
very minor spelling
Upstream-commit: 77766834a3326e52a35b8b0667329b81098b4b06
Component: engine
 2014-03-03 19:19:16 -05:00
Tianon Gravi
ad94508fb5 Merge pull request #4419 from SvenDowideit/tweak-DCO-hook-for-windows 
Fix newlines echoing in DCO git hook contrib script
Upstream-commit: 93c1a7b79615b8e94fe9d826aee24e01a7087f94
Component: engine
 2014-03-03 17:14:08 -07:00
Sven Dowideit
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
Sven Dowideit
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
Tianon Gravi
24c198410e Merge pull request #4435 from vieux/warning_makefile 
Remove warnings from Makefile
Upstream-commit: b1267cb6ada5494b5fc720c08fc27844cd5c6d0e
Component: engine
 2014-03-03 16:40:31 -07:00
Victor Vieux
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
Sven Dowideit
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
Michael Crosby
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
Victor Vieux
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
unclejack
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
unclejack
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
Victor Vieux
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
Michael Crosby
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
Guillaume J. Charmes
3e1518adfc Merge pull request #4428 from vieux/add_warning_flags 
add warning for deprecatd flags
Upstream-commit: e070db75fed525efdbfe0a056c9e38f3d46604cb
Component: engine
 2014-03-03 12:09:09 -08:00
Victor Vieux
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
Michael Crosby
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
unclejack
60e9c4cdca Merge pull request #4426 from vieux/prevent_grouping_-- 
prevent flag grouping with --
Upstream-commit: 93f925c5336489e7c47f9471cfa89a8c6b7a850e
Component: engine
 2014-03-03 21:30:49 +02:00
Victor Vieux
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
Victor Vieux
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
unclejack
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
Victor Vieux
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
Victor Vieux
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
Michael Crosby
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
Tianon Gravi
69778919d2 Merge pull request #4420 from unclejack/bump_to_go_1.2.1 
Bump Go to 1.2.1 in the Dockerfile
Upstream-commit: ded2fb883dd3c20069f01e37178ce585d1c0c6b0
Component: engine
 2014-03-03 07:56:31 -07:00
Alexander Larsson
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
Alexander Larsson
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
unclejack
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
James Turnbull
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
James Turnbull
794cdca1e3 Merge pull request #4410 from 1uptalent/fix_typo_in_build_command_doc 
DOC: Fix switch name for tagging images in build command
Upstream-commit: 881cdd2a02e197f810ac1614127923319435c4c9
Component: engine
 2014-03-02 23:17:51 -05:00
James Turnbull
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
Ian Truslove
1c9accc818 Fix minor typo 
Upstream-commit: 3de1d25c11c592510cd1be3c8c2e7fa754305484
Component: engine
 2014-03-02 13:32:48 -07:00
James Turnbull
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
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
Tianon Gravi
8de7212d3c Merge pull request #4411 from lewispeckover/fix_mkimage-yum_mknod 
Add "mkdir /dev" before doing mknod in mkimage-yum
Upstream-commit: a61096ec7033b17e2be67406ee522e0b493e85c3
Component: engine
 2014-03-02 08:44:54 -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
German DZ
d89cecd319 DOC: Fix switch name for tagging images in build command 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: 62b88cd61943bdc025a989bc3e113434d9c44880
Component: engine
 2014-03-02 13:50:34 +01: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