clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-23 15:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,407 Commits 9 Branches 112 Tags
971240696f3fd74ece726245afd60bca1f86ecbc
Commit Graph

10407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle 971240696f Merge pull request #7660 from rhatdan/selinux-volumes 
Change default label of container volumes to shared SELinux Label
 2014-09-09 11:16:19 -07:00
Jessie Frazelle 49c32189c0 Merge pull request #7958 from dqminh/fix-lxc-template-console 
fix console attribute in lxc template
 2014-09-09 11:00:48 -07:00
Daniel, Dao Quang Minh 4b3b54ca38 fix console attribute in lxc template 
commit 4aa5da278f moves `Console` from Command to
ProcessConfig, but missed the change in lxc_template. Therefore creating a
container with tty using lxc driver with fail with error

template: lxc:60:20: executing "lxc" at <.Console>: Console is not a field of
struct type struct { *execdriver.Command; AppArmor bool; ProcessLabel string; MountLabel string }

This changes lxc_console template to refers to `.ProcessConfig.Console`

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-09-09 13:51:13 -04:00
James Turnbull 1ed467a9ae Merge pull request #7953 from SvenDowideit/reformat-api-docs 
Reformat the API docs so I can read them
 2014-09-09 12:52:26 -04:00
Jessie Frazelle 17314e2fe8 Merge pull request #7951 from taohu/typo 
typo fix: immediatly -> immediately
 2014-09-09 09:44:51 -07:00
Dan Walsh 73617e5e18 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)
 2014-09-09 08:18:20 -04:00
Sven Dowideit f36dfbdcaf Reformat the API docs so I can read them 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-09 16:17:38 +10:00
Hu Tao fcc7ec8073 typo fix: immediatly -> immediately 
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
 2014-09-09 01:16:19 -04:00
Fred Lifton f1095b801e Merge pull request #7949 from SvenDowideit/remove-doubled-up-page-heading 
Make the side bar about in-document navigation by removing the duplicated h1
 2014-09-08 20:50:06 -07:00
Sven Dowideit 1f25bfea2d 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)
 2014-09-09 11:44:51 +10:00
Fred Lifton bb8ea1fdc1 Merge pull request #7931 from jamtur01/device 
Added --device flag to run reference
 2014-09-08 14:33:56 -07:00
Fred Lifton 577066fb45 Merge pull request #7930 from jamtur01/nformat 
Very minor formatting update for docs/sources/articles/networking.md
 2014-09-08 14:28:29 -07:00
Fred Lifton 10e4ca760c Merge pull request #7929 from SvenDowideit/doc-tar-stream 
Sven Dowideit 	Update export, copy and build API to say 'TAR STREAM' for all versions.
 2014-09-08 14:27:45 -07:00
Michael Crosby 85314e7e58 Merge pull request #7759 from unclejack/pull_latest_by_default 
make docker pull only the latest tag by default
 2014-09-08 13:43:21 -07:00
Tibor Vass d7e29a2cc8 Merge pull request #7891 from tlipinski/master 
Allows installation on Linux Mint Debian Edition
 2014-09-08 14:44:07 -04:00
Jessie Frazelle 7bb5ec3be6 Merge pull request #7862 from Gandi/bugfixes/segfault-registry-session 
Fix SEGFAULT if dns resolv error
 2014-09-08 11:38:34 -07:00
Tomasz Lipinski 021722cf7a Allows installation on Linux Mint Debian Edition 
Otherwise platform won't be detected

Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
 2014-09-08 20:38:02 +02:00
Jessie Frazelle f7429a2121 Merge pull request #7871 from vincentbernat/update/zsh-completion-1 
zsh: update zsh completion for docker command
 2014-09-08 11:25:55 -07:00
Tibor Vass 43eab4034b Merge pull request #7938 from unclejack/make_run_test_verbose 
integ-cli: increase verbosity for mem & cpu test
 2014-09-08 14:10:58 -04:00
Michael Crosby 18edea2a6f Merge pull request #7609 from ewindisch/max_imgname 
Restrict length of repository names
 2014-09-08 11:06:54 -07:00
Michael Crosby 11700512b9 Merge pull request #7920 from unclejack/fix_layer_permissions 
ensure correct permissions are set for directories
 2014-09-08 10:51:50 -07:00
unclejack 05a76477e6 integ-cli: increase verbosity for mem & cpu test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-08 20:46:45 +03:00
unclejack cc5fb986b0 integ-cli: test correct directory permissions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-08 20:02:40 +03:00
Alexandr Morozov 2360d4a440 Merge pull request #7886 from jfrazelle/7047-json-line-delim 
Fix line delimited JSON response
 2014-09-08 20:47:21 +04:00
Jessica Frazelle d2f75a3040 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: )
 2014-09-08 09:41:26 -07:00
Tibor Vass 68e07f3fa0 Merge pull request #7914 from jfrazelle/7802-backwards-compat-state 
fixes #7802, when api version 1.11 is `json.Marshal`ing the container st...
 2014-09-08 12:39:55 -04:00
Tianon Gravi 60ab9eaf4a Merge pull request #7868 from baloo/patch-1 
Switch TESTFLAGS to use `-test.run` instead of `-run`
 2014-09-08 10:34:49 -06:00
Jessica Frazelle f49c3f287b 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: )
 2014-09-08 09:30:33 -07:00
Leszek Kowalski 691bbf6a29 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)
 2014-09-08 19:11:48 +03:00
James Turnbull 8f0034c3ee Merge pull request #7933 from ahmetalpbalkan/doc-remote_api_client_libraries.md 
add C# docker client library link to remote API client libraries doc
 2014-09-08 07:25:24 -04:00
Ahmet Alp Balkan cde53c51b5 add C# docker client library link 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2014-09-07 23:29:04 -07:00
James Turnbull 9e34c42d20 Added --device flag to run reference 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-09-07 23:17:14 -04:00
James Turnbull 1ce3e22efc Very minor formatting update for docs/sources/articles/networking.md 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-09-07 22:39:37 -04:00
Sven Dowideit 77fa306d63 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)
 2014-09-08 11:54:21 +10:00
Mustafa Akın b9e889c309 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)
 2014-09-08 11:52:27 +10:00
Sven Dowideit 4b3ee6c106 Merge pull request #7908 from nhsiehgit/issue363imgfix 
added a css fix for the image bug issue
 2014-09-08 11:10:03 +10:00
Nathan Hsieh e44bdd612b added a css fix for the image bug issue 
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
(github: nhsiehgit)
 2014-09-05 10:48:51 -07:00
Tianon Gravi 38186084b3 Merge pull request #7893 from tianon/travis-run-tests 
Update Travis to also run the test suite
 2014-09-05 09:19:38 -06:00
James Turnbull 712702aa79 Merge pull request #7894 from SvenDowideit/use-local-jquery 
Use a local copy of jquery so that the docs work in China, and offline too.
 2014-09-05 08:51:09 -04:00
Arthur Gautier 3e6c69e5a1 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>
 2014-09-05 13:40:06 +02:00
Sven Dowideit 5fe94f0d91 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)
 2014-09-05 11:48:34 +10:00
Victor Vieux b0cff06c97 Merge pull request #7883 from LK4D4/fix_build_race 
Fix race between dispatchers.run and toDisk
 2014-09-04 17:32:46 -07:00
Sven Dowideit 03fdc7d2c1 Merge pull request #7890 from fredlf/docs-cherry-pick-update-process 
Changes to Sven's cherry pick process
 2014-09-05 09:58:18 +10:00
Tianon Gravi 068b9ac4d2 Update Travis to also run the test suite 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-09-04 17:20:02 -06:00
Tibor Vass 1a2a4f61ab Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
 2014-09-04 15:30:03 -07:00
Tianon Gravi d3b5bf5d24 Merge pull request #7763 from jamtur01/kate 
Add syntax highlighting file for KDE's "Kate" editor
 2014-09-04 15:28:11 -06:00
Fred Lifton b23daef3ec 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)
 2014-09-04 13:32:16 -07:00
James Turnbull f7c0ac9a8b Merge pull request #7873 from jankeromnes/patch-1 
Update SSH demo to ubuntu 14.04
 2014-09-04 15:45:55 -04:00
Jan Keromnes 98f57d1c39 Update SSH demo to ubuntu 14.04 
Signed-off-by: Jan Keromnes <janx@linux.com>
 2014-09-04 20:27:41 +02:00
James Turnbull bc26aa7b50 Merge pull request #7876 from nhsiehgit/typofix 
small typo. wrapping cut code snippet
 2014-09-04 12:37:07 -04:00