p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,711 Commits 2 Branches 295 Tags
b3bc92caaff68c74689cabc2ea846da70fc223b9
Commit Graph

7711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
b3bc92caaf Increment native driver version with these changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d6c3674349c09318e8d1fb3ce43dbabc15c97da
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
8ab9384720 Move capabilities into security pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a0b3610664c2269fd5932f294adae72e6e54020
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
28044eef7b Move mounts into types.go 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 156987c118f6f4067794e09e90aabeee0002d05c
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
c05360ff3b Move rest of console functions to pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a949d39f195e7b87288b10b0ef31843e6a3d8eb0
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
0099e7d236 Refactor mounts into pkg to make changes easier 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 05b611574f85c7ff7d479e04e01ac2b57b233591
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
0cfbbc14e7 Move console into its own package 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: de3d51b0a824e31d7e245aed958d53f436456699
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
a750afc31e Mount over dev and only copy allowed nodes in 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5ba1242bdc309352c2b0b9a1ef9e07fe835e4857
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
20ba5d97da No not mount sysfs by default for non privilged containers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 81e5026a6afb282589704fd5f6bcac9ed50108ea
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
bdab73285c Add lxc support for restricting proc 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0779a8c3287fbf7ff1938df10897b551b839cbee
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
9da373d6b1 Add restrictions to proc in libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 60a90970bc4add3547064004f08c19ab5027141b
Component: engine
 2014-04-24 10:35:19 -07:00
Michael Crosby
4b4b1b7313 Move apparmor into security sub dir 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d26ea78e42ebf18219b88e01c6252f30aa764aa2
Component: engine
 2014-04-24 10:35:19 -07:00
Michael Crosby
f6b631e3c8 Merge pull request #5381 from rjnagal/master 
Add support for cpu hardcapping to cgroups.
Upstream-commit: 4ed165210fd81ab7ee41cb7b67667b17949b084e
Component: engine
 2014-04-24 10:04:17 -07:00
Guillaume J. Charmes
8b8d39c95a Merge pull request #5356 from alexlarsson/devmapper-no-mount-in-create 
devicemapper: Don't mount in Create()
Upstream-commit: 56b779c32154327c2939a2e653fda3623b6f63b4
Component: engine
 2014-04-24 08:19:59 -07:00
Rohit Jnagal
4a39371d62 Add support for cpu hardcapping to cgroups. 
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 264dc8a46bb7f7679439d0a2c41c79a09642acab
Component: engine
 2014-04-24 14:43:02 +00:00
O.S. Tezer
ca86832693 Merge pull request #5377 from SvenDowideit/fix-terms-links 
Merged.
Upstream-commit: df20a0e7a356c719b67166931e1ab44ad6dff4e1
Component: engine
 2014-04-24 15:42:10 +03:00
Sven Dowideit
b6080f6f5b Looking into some broken links, I noticed that we don't need to use 
relative paths, and also fixed some broken images.

There are still more todo - next PR I think :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ada86fc5b736d8b3209429c584384fd9974a148a
Component: engine
 2014-04-24 22:20:04 +10:00
O.S.Tezer
772ac62a9b Docs auto-conversion fixes and MD marking and structure improvements. 
- Remove redundant chars and all errors caused by RST->MD conversion.
   e.g. [/#, /\, \<, />, etc.]
 - Fix broken inter-document links
 - Fix outbound links no-longer active or changed
 - Fix lists
 - Fix code blocks
 - Correct apostrophes
 - Replace redundant inline note marks for code with code marks
 - Fix broken image links
 - Remove non-functional title links
 - Correct broken cross-docs links
 - Improve readability

Note: This PR does not try to fix/amend:

 - Grammatical errors
 - Lexical errors
 - Linguistic-logic errors etc.

It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Fix backtick issues

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c932667cd26f00bb64ddf0c1a7c7de3ac95aa4be
Component: engine
 2014-04-24 22:19:32 +10:00
James Turnbull
e8a3419885 Merge pull request #5362 from sindhus/patch-2 
Update link to interactive tutorial
Upstream-commit: 83b388c979b3d24c6e9f1604eaa46f5f1ce10ecb
Component: engine
 2014-04-24 00:22:04 -04:00
Sven Dowideit
32bae00bdb Merge pull request #5349 from ipbabble/manpages 
Manpages - fixes and merged tianon/docker man1-assumption branch
Upstream-commit: 0ade0af27ee5de5ac7e1e469dcc23ad408dd3b39
Component: engine
 2014-04-24 09:43:42 +10:00
Solomon Hykes
f06dbcb7ce Merge pull request #5345 from shykes/engine-installer 
engine.Installer: a standard interface for "installable" services
Upstream-commit: 0fe48b0e5914fa1384d061546970e23fb348b53f
Component: engine
 2014-04-23 16:16:55 -07:00
Guillaume J. Charmes
415365ba93 Merge pull request #5347 from crosbymichael/engine-root 
Remove root dir from engine
Upstream-commit: baf6cf90561a1582683c92dd209e36f78a39288e
Component: engine
 2014-04-23 13:53:08 -07:00
Sindhu S
8c2dd7e7a4 Update link to interactive tutorial 
Upstream-commit: 81477a204f910fb5ce518a62c64047a0aa9ce017
Component: engine
 2014-04-24 01:59:52 +05:30
Sindhu S
2ec638dea9 Update link to interactive tutorial 
Upstream-commit: 6e6b8b69cdac5154afa823255252bca5c4890c6e
Component: engine
 2014-04-24 01:02:54 +05:30
Michael Crosby
d8eb119f29 Remove error from engine.New() 
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7100ace42bda2660d1eaecb2ec096ba6753688ea
Component: engine
 2014-04-23 11:54:35 -07:00
Tianon Gravi
7b803efe2e Merge pull request #5336 from tianon/slightly-more-organized-check-config 
Move "possible config locations" list to the top of check-config.sh
Upstream-commit: 6b0f0af0e9a755d4d8e503f4e27ad8b0d24208c5
Component: engine
 2014-04-23 11:21:08 -06:00
James Turnbull
40452ad13b Merge pull request #5351 from SvenDowideit/docs-conditional-beta-warning 
Docs conditional beta warning
Upstream-commit: 03aacc4b917f285e7d55f8e2913d41b5dc965b20
Component: engine
 2014-04-23 08:55:08 -04:00
Alexander Larsson
505086c799 devicemapper: Don't mount in Create() 
We used to mount in Create() to be able to create a few files that
needs to be in each device. However, this mount is problematic for
selinux, as we need to set the mount label at mount-time, and it
is not known at the time of Create().

This change just moves the file creation to first Get() call and
drops the mount from Create(). Additionally, this lets us remove
some complexities we had to avoid an extra unmount+mount cycle.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 73d9ede12c9328c44e38699dbe3a04479d3926e6
Component: engine
 2014-04-23 13:50:53 +02:00
Sven Dowideit
6e769bf432 Merge pull request #5337 from tianon/man1-assumption 
Update contributed man page file names and compilation script
Upstream-commit: f436c744da8b3ab4da94d385e16eeb672b31dcd7
Component: engine
 2014-04-23 21:10:01 +10:00
Sven Dowideit
9a6a4062e0 make the non-release doc warning conditional and add version info 
use the beta-warning area to tell the user what VERSION of docker, git
branch, and links to the official release version docs are.

requires / extends PR #5272

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: dc982d3053bf46e03ad27c29d4662a9d5ba5e819
Component: engine
 2014-04-23 21:07:12 +10:00
O.S.Tezer
b86c5e7324 Development docs warning for beta-docs.docker.io 
Update: Fix alignment issues of the "warning" block.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Docker-DCO-1.1-Signed-off-by: O.S.Tezer <ostezer@gmail.com> (github: SvenDowideit)
Upstream-commit: 9d38fd0eefb2df0bf087a67fad2ad852f28e2e96
Component: engine
 2014-04-23 21:07:11 +10:00
O.S. Tezer
d5fe3b7401 Merge pull request #5352 from rmoriz/patch-1 
Merged.
Upstream-commit: a99d0c7136d5f477c41a94def71b9966d66b3b07
Component: engine
 2014-04-23 12:42:41 +03:00
Roland Moriz
ba98365746 fixed broken link to chef community site 
Upstream-commit: 086b3208ea0f152f5c9501805fd0d8d1c95c7aad
Component: engine
 2014-04-23 09:17:57 +02:00
William Henry
6f36448e8e Fixed some missing ']' and the TAG 
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.1.md
Upstream-commit: a6fd2c237ecca330554ec8bdaf7b2acfe68de1ce
Component: engine
 2014-04-22 22:35:59 -06:00
William Henry
ef2162c78d Merge branch 'man1-assumption' of https://github.com/tianon/docker into manpages 
Upstream-commit: 687653e59980e35e07521aff7a5cd87b4b0d3be6
Component: engine
 2014-04-22 22:21:39 -06:00
William Henry
107ba1c425 Fixed an missing '-' on the "--rm" 
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.md
Upstream-commit: a5b4a907485c76088d02226df62b0a27bd76117f
Component: engine
 2014-04-22 22:17:33 -06:00
Michael Crosby
e886c73325 Update tests with engine root removal 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 87e8d7754e218d93b480b94537d07793f6680515
Component: engine
 2014-04-22 19:24:47 -07:00
Tianon Gravi
c80553de38 Merge pull request #5346 from SvenDowideit/dont-alocate-port-for-docs-release 
Remove port allocation from `make docs-release`
Upstream-commit: 96588fb85dce874b39bc7b6fdb9f797734c1c4dc
Component: engine
 2014-04-22 20:15:18 -06:00
Michael Crosby
5c5b3c1ca6 Remove the concept of a root dir out of engine 
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Conflicts:
	integration/runtime_test.go
Upstream-commit: 672edfe807c597a1c245bce996a150dfdf273a3c
Component: engine
 2014-04-22 19:04:03 -07:00
Sven Dowideit
746d0d0ba1 don't try allocating a port to upload a docs release to s3 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e0af429a2acd7681f423ca29ff88b60d9bf2450f
Component: engine
 2014-04-23 11:59:16 +10:00
Victor Vieux
0a4cff6ebb Merge pull request #5343 from shykes/beamsh 
beam + beam/data + dockerscript
Upstream-commit: 817494d00923d00991311c1ba0a17acaf2dd1a7a
Component: engine
 2014-04-22 17:01:05 -07:00
Solomon Hykes
bea68ba524 engine.Installer: a standard interface for "installable" services 
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.

This can be used as an entrypoint for external plugins etc.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4353f25e10d19f414bdd5b20488824fb2b834d6e
Component: engine
 2014-04-22 16:51:06 -07:00
Solomon Hykes
fba1cacd59 Fix Go formatting in beam and dockerscript 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: bf51f36d8f07d0c53f7b7b3c21ae372f7ca3be33
Component: engine
 2014-04-22 16:16:29 -07:00
Solomon Hykes
bd9345fd64 pkg/dockerscript: add MAINTAINERS file 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0bf2109121c3b6e12f781acc14016af451c5cd3d
Component: engine
 2014-04-22 15:50:24 -07:00
Solomon Hykes
bed3b0cf53 beam/examples/beamsh: 'chdir' changes the current directory 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: bc6303f15d9ac4f2f281bbf4e4d76f7517e10117
Component: engine
 2014-04-22 15:50:24 -07:00
Solomon Hykes
0d5fc83e93 beam/examples/beamsh: 'exec' can communicate with its child via beam. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6ce4d2c8424e029237b4ad0c615a4ff6204a1064
Component: engine
 2014-04-22 15:50:24 -07:00
Solomon Hykes
81a0f67a86 beam/examples/beamsh: use beam.Router to simplify 'multiprint' and fix job passthrough 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 271ba1804349217d8cc22cfdd412a1741dbbcfea
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
b636123fc3 beam: new routing functions Route.KeyEquals, Route.KeyIncludes, Route.NoKey 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0d08d36bf576babd74f21b83ccde019acde4d9c7
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
262cbf977c beam/examples/beamsh: use beam.Router to simplify 'trace' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 30424f4e3a40ec21ac25e5c3f9ef45c3109c9f06
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
752ad4f822 beam/examples/beamsh: move builtins to a separate file for readability 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: d3df4b5baf0d3707dd8bbf700c5836dfdfac8752
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
6bbf98f17b beam/examples/beamsh: simplify commands by always creating and sending stdout and stderr for them 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0822d67b2dc05dc2500e3b898dc3604be47fcd84
Component: engine
 2014-04-22 15:50:23 -07:00