docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
10,400 Commits 12 Branches 297 Tags
2a0b4ab45f4e91f1c7818feb6dd681bfc436e9b8
Commit Graph

9570 Commits

Author SHA1 Message Date
Dan Walsh
2a0b4ab45f Change default label of container volumes to shared SELinux Label 
Since these will be shared between containers we want to label
them as svirt_sandbox_file_t:s0.  That will allow multiple containers
to write to them.

Currently we are allowing container domains to read/write all content in
/var/lib/docker because of container volumes.  This is a big security hole
in our SELinux story.

This patch will allow us to tighten up the security of docker containers.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 73617e5e18159e5f791d2860c7857cd5dea31be4
Component: engine
 2014-09-09 08:18:20 -04:00
Sven Dowideit
f52bbe12a8 Make the side bar about in-document navigation by removing the duplicated h1 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1f25bfea2ddbfa5c41ab3f0cd0716229833ebac1
Component: engine
 2014-09-09 11:44:51 +10:00
Fred Lifton
5d6a00955d Merge pull request #7931 from jamtur01/device 
Added --device flag to run reference
Upstream-commit: bb8ea1fdc1c5c3e1b90c15b451ab22334c86e70c
Component: engine
 2014-09-08 14:33:56 -07:00
Fred Lifton
4188db4b54 Merge pull request #7930 from jamtur01/nformat 
Very minor formatting update for docs/sources/articles/networking.md
Upstream-commit: 577066fb45114096b919fe073f0436e181e92228
Component: engine
 2014-09-08 14:28:29 -07:00
Fred Lifton
b5848ae179 Merge pull request #7929 from SvenDowideit/doc-tar-stream 
Sven Dowideit 	Update export, copy and build API to say 'TAR STREAM' for all versions.
Upstream-commit: 10e4ca760ca1d1145169dbff94e0c8414928b79c
Component: engine
 2014-09-08 14:27:45 -07:00
Michael Crosby
ca58c61a83 Merge pull request #7759 from unclejack/pull_latest_by_default 
make docker pull only the latest tag by default
Upstream-commit: 85314e7e58a17cf3ebc4b29511b3399cd758b1ae
Component: engine
 2014-09-08 13:43:21 -07:00
Tibor Vass
cc1afc998d Merge pull request #7891 from tlipinski/master 
Allows installation on Linux Mint Debian Edition
Upstream-commit: d7e29a2cc8ca749a40e3aa5a42713f76c0d49830
Component: engine
 2014-09-08 14:44:07 -04:00
Jessie Frazelle
0ece639e47 Merge pull request #7862 from Gandi/bugfixes/segfault-registry-session 
Fix SEGFAULT if dns resolv error
Upstream-commit: 7bb5ec3be6f3f52cd1aa65e4be20a6d6526a1d3a
Component: engine
 2014-09-08 11:38:34 -07:00
Tomasz Lipinski
3d89f95ea0 Allows installation on Linux Mint Debian Edition 
Otherwise platform won't be detected

Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
Upstream-commit: 021722cf7afade02c382294e4f276ca7edd1ca69
Component: engine
 2014-09-08 20:38:02 +02:00
Jessie Frazelle
3593be2c0f Merge pull request #7871 from vincentbernat/update/zsh-completion-1 
zsh: update zsh completion for docker command
Upstream-commit: f7429a2121af0e5a77751c674c8a64dbd76c69d8
Component: engine
 2014-09-08 11:25:55 -07:00
Tibor Vass
a07f296d31 Merge pull request #7938 from unclejack/make_run_test_verbose 
integ-cli: increase verbosity for mem & cpu test
Upstream-commit: 43eab4034b1a88e8f68ce96be44643475201d94d
Component: engine
 2014-09-08 14:10:58 -04:00
Michael Crosby
6dc15f86be Merge pull request #7609 from ewindisch/max_imgname 
Restrict length of repository names
Upstream-commit: 18edea2a6f5b01e38e3189dbec54566ad4a67f4f
Component: engine
 2014-09-08 11:06:54 -07:00
Michael Crosby
e6516d4319 Merge pull request #7920 from unclejack/fix_layer_permissions 
ensure correct permissions are set for directories
Upstream-commit: 11700512b90e093824647bcbbbdfa26ddafea7cc
Component: engine
 2014-09-08 10:51:50 -07:00
unclejack
ff6065975e integ-cli: increase verbosity for mem & cpu test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 05a76477e6a70975b1c60637c3f8e2d7a507c490
Component: engine
 2014-09-08 20:46:45 +03:00
unclejack
71e8f9134d integ-cli: test correct directory permissions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: cc5fb986b03ce28075a9f3aee248d401f3be0c96
Component: engine
 2014-09-08 20:02:40 +03:00
Jessica Frazelle
0db8f36c75 Fix line delimited JSON response 
For GET /events, line delimit JSON.
Fixes #7047

Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
Upstream-commit: d2f75a3040e72562ffa825d5c3efa7004af2640a
Component: engine
 2014-09-08 09:41:26 -07:00
Tibor Vass
4ee36fda1c Merge pull request #7914 from jfrazelle/7802-backwards-compat-state 
fixes #7802, when api version 1.11 is `json.Marshal`ing the container st...
Upstream-commit: 68e07f3fa09811468a81fb22575650bee69066e6
Component: engine
 2014-09-08 12:39:55 -04:00
Tianon Gravi
b4958aa265 Merge pull request #7868 from baloo/patch-1 
Switch TESTFLAGS to use `-test.run` instead of `-run`
Upstream-commit: 60ab9eaf4a19d691d16c69496364008bbb69d8db
Component: engine
 2014-09-08 10:34:49 -06:00
Jessica Frazelle
2ff1cc83fb fixes #7802, when api version 1.11 is json.Marshaling the container struct 
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
Upstream-commit: f49c3f287b0d26dc705940effa0ec03e1de7bb99
Component: engine
 2014-09-08 09:30:33 -07:00
Leszek Kowalski
8419ddae48 Include directories that contain changes inside them when calculating diff. Fixes #6722 
Docker-DCO-1.1-Signed-off-by: Leszek Kowalski <github@leszekkowalski.pl> (github: ljk)
Upstream-commit: 691bbf6a2971bd6d57892cbf7efe188f431919a2
Component: engine
 2014-09-08 19:11:48 +03:00
Ahmet Alp Balkan
b754dfbfae add C# docker client library link 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cde53c51b575d0cdeb01fc3428877ab63165e8b0
Component: engine
 2014-09-07 23:29:04 -07:00
James Turnbull
a6318245ce Added --device flag to run reference 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 9e34c42d20ef95225bb6c36235d22935365cbef9
Component: engine
 2014-09-07 23:17:14 -04:00
James Turnbull
c28d415c47 Very minor formatting update for docs/sources/articles/networking.md 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 1ce3e22efc699d90f69b29f68fedf059ec4379a7
Component: engine
 2014-09-07 22:39:37 -04:00
Sven Dowideit
30cb064720 Update export, copy and build API to sat 'TAR STREAM' for all versions. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 77fa306d63f0c0e48f49f6679beeb1ea55673f2a
Component: engine
 2014-09-08 11:54:21 +10:00
Mustafa Akın
816f39672a Update docker_remote_api_v1.14.md 
It is a tar stream, you should mention that somehow.

Here is the proof:

```
	host:~$ docker run -t -i ubuntu:14.04 bash
	root@c39be4c7b7c8:/# echo "my file contents" > abc
	root@c39be4c7b7c8:/# cat abc
	my file contents
	root@c39be4c7b7c8:/# exit
	host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy
	abc0100644000000000000000000000002112402102531007674 0ustar0000000000000000my file contents
	host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy > response_content
	  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
	                                 Dload  Upload   Total   Spent    Left  Speed
	100  2067  100  2048  100    19  56968    528 --:--:-- --:--:-- --:--:-- 58514
	host:~$ tar xvf response_content
	abc
	host:~$ cat abc
	my file contents
```

Docker-DCO-1.1-Signed-off-by: Mustafa Akın <mustafa91@gmail.com> (github: SvenDowideit)
Upstream-commit: b9e889c30988f3babbc059a883d7f3096611ad60
Component: engine
 2014-09-08 11:52:27 +10:00
Sven Dowideit
88d96e44fd Merge pull request #7908 from nhsiehgit/issue363imgfix 
added a css fix for the image bug issue
Upstream-commit: 4b3ee6c10642a5813b89d5b2e32c01dcede4c871
Component: engine
 2014-09-08 11:10:03 +10:00
Nathan Hsieh
112f364609 added a css fix for the image bug issue 
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
(github: nhsiehgit)
Upstream-commit: e44bdd612b93e806a1cfcba8c156860de5ef3791
Component: engine
 2014-09-05 10:48:51 -07:00
Tianon Gravi
7c69a280eb Merge pull request #7893 from tianon/travis-run-tests 
Update Travis to also run the test suite
Upstream-commit: 38186084b3ade82049d03f4f83640a0d47c3040c
Component: engine
 2014-09-05 09:19:38 -06:00
Arthur Gautier
64908e2dd5 Fix SEGFAULT if dns resolv error 
Per registry.doRequest, res and client might be nil in case of error
For example, dns resolution errors, /etc/docker/certs.d perms, failed
loading of x509 cert ...
This will make res.StatusCode and res.Body SEGFAULT.

Signed-off-by: Arthur Gautier <baloo@gandi.net>
Upstream-commit: 3e6c69e5a1dbb428c4a62656f96cfe77c19986f9
Component: engine
 2014-09-05 13:40:06 +02:00
Sven Dowideit
1218d181fb Use a local copy of jquery so that the docs work in China, and offline too. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 5fe94f0d914a20846142a365655dad7a99527b44
Component: engine
 2014-09-05 11:48:34 +10:00
Victor Vieux
7eea51ea83 Merge pull request #7883 from LK4D4/fix_build_race 
Fix race between dispatchers.run and toDisk
Upstream-commit: b0cff06c9743f1f4edeea38c13a8b657eef446e4
Component: engine
 2014-09-04 17:32:46 -07:00
Sven Dowideit
da01801fe3 Merge pull request #7890 from fredlf/docs-cherry-pick-update-process 
Changes to Sven's cherry pick process
Upstream-commit: 03fdc7d2c183948d2415ba1fc19b8678b59d9e7a
Component: engine
 2014-09-05 09:58:18 +10:00
Tianon Gravi
341cb3161f Update Travis to also run the test suite 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 068b9ac4d2f236905bb9deb024189082876a3c3f
Component: engine
 2014-09-04 17:20:02 -06:00
Tibor Vass
0f1377200f Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
Upstream-commit: 1a2a4f61abb3a5b40de70b10f39c90d7593679a5
Component: engine
 2014-09-04 15:30:03 -07:00
Tianon Gravi
d4f0012956 Merge pull request #7763 from jamtur01/kate 
Add syntax highlighting file for KDE's "Kate" editor
Upstream-commit: d3b5bf5d24026b1c60aaa77d25460b23c7564f6a
Component: engine
 2014-09-04 15:28:11 -06:00
Fred Lifton
d94ba95b52 Changes to Sven's cherry pick process 
Added content and revised after walk-through

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: b23daef3ec9fdecc6b7bcc1e3a657eccf1f5f399
Component: engine
 2014-09-04 13:32:16 -07:00
Jan Keromnes
4d1ff5fd83 Update SSH demo to ubuntu 14.04 
Signed-off-by: Jan Keromnes <janx@linux.com>
Upstream-commit: 98f57d1c392eab7df30fa3179c8e0f99a418e772
Component: engine
 2014-09-04 20:27:41 +02:00
James Turnbull
dfcc6a8638 Merge pull request #7876 from nhsiehgit/typofix 
small typo. wrapping cut code snippet
Upstream-commit: bc26aa7b50a5e9b01b274cffb89e3e0249d279f1
Component: engine
 2014-09-04 12:37:07 -04:00
Alexandr Morozov
78de9287f3 Fix race between dispatchers.run and toDisk 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: f17410da5e4b5fa0e0dd2614f9b6e00dbcf66da6
Component: engine
 2014-09-04 19:43:28 +04:00
Alexandr Morozov
dc74831ee4 Don't initialize network for 'none' mode 
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: ba24820284a7a87642f2b668987c1627d6977ea2
Component: engine
 2014-09-04 09:50:58 +04:00
Sven Dowideit
a87ee70b4f Merge pull request #7828 from vieux/update_api_docs 
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
Upstream-commit: dbe112360718b6ddf6e74c8fcb6cf63204f2bbf2
Component: engine
 2014-09-04 13:05:06 +10:00
Sven Dowideit
7dbfb968f4 Merge pull request #7858 from somaopensource/typo-fix 
Dockerfile documentation typo and content fix
Upstream-commit: e1907bafb7b95a28e262c8f91524834627aaaf91
Component: engine
 2014-09-04 13:03:04 +10:00
Michael Crosby
4d55ed3104 Merge pull request #7864 from unclejack/fix_panic_registry_session 
registry/session: fix panic in GetRemoteImageLayer
Upstream-commit: d9fc61066d27b964ec337dc3db877ab3151b9280
Component: engine
 2014-09-03 18:17:03 -07:00
Nathan Hsieh
534f9322ba small typo. fixed broken code snippet 
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com> (github: nhsiehgit)
Upstream-commit: adc9a14db49f7e8ffd7cecb788bb9b560a7a3aae
Component: engine
 2014-09-03 17:53:45 -07:00
Tibor Vass
7f4f710d0d handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 39310448da1ed05d39f4400a56dd43e71591ae5b
Component: engine
 2014-09-03 17:14:19 -07:00
Tibor Vass
7dcf943afc fix race in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: defe01daf87237e42a9275a0b286b0f71c60de25
Component: engine
 2014-09-03 17:14:19 -07:00
Victor Vieux
713ee31e08 Merge pull request #7865 from cure/master 
fix typos in error messages
Upstream-commit: affef9e785febbf9ecd832022113b21b5b7e10a3
Component: engine
 2014-09-03 16:03:20 -07:00
Tibor Vass
daf4dd047c Merge pull request #7818 from thomasleveil/completion-docker-build 
Add --force-rm to docker build command completion
Upstream-commit: 782cde2c0f2960fe42298e3f4ca38d1b42c27e5f
Component: engine
 2014-09-03 14:44:13 -07:00
James Turnbull
47b6756608 Merge pull request #7850 from fredlf/add_cherrypick_process 
Add cherrypick process
Upstream-commit: a3326c346990e1fc797d8de0caace4314bf4ab05
Component: engine
 2014-09-03 17:33:49 -04:00
Vincent Bernat
834b945b71 zsh: update zsh completion for docker command 
zsh completion is updated with the content of
felixr/docker-zsh-completion.

The major change since the last merge is the removal of use of
sed/awk. This should help a lot OSX users who previously had to install
gawk and gsed.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: dc2eab2cf48be2dc763f132fea1e1a72b0c8e03c
Component: engine
 2014-09-03 22:30:11 +02:00