starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 07:25:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,793 Commits 14 Branches 323 Tags
c4b74db06dbfddb365f0ab350b57d9c09fdef451
Commit Graph
7200 Commits
Author SHA1 Message Date
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
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
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
Solomon Hykes d0489babdf beam/examples/beamsh: use beam.Router to simplify 'logger' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 63fd2ec0f7ec091912435cedc081b132e66ae658
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes 679c521f8a beam/examples/beamsh: use beam.Router to simplify the 'stdio' command 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 9206b18818db988621f60cbf869eb20acd1a49e9
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes 2a384a9a0b beam: Router can route beam messages with a convenient set of rules and handlers 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 8f5435e80c3dbaa27429bbb7cadf2c735caa76de
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes 66816b58ac beam/examples/beamsh: move example scripts to scripts/ 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 40b4f86eab7b5bf7ca7d85eb8cc7b715fd03feab
Component: engine
 2014-04-22 15:50:22 -07:00
Alexander Larsson 2ef34ed7cf beam: Fix double close of fds in SendUnix 
Instead of calling syscall.Close() on the fds in sendUnix() we call
Close() on the *os.File in Send(). Otherwise the fd will be closed, but
the *os.File will continue to live, and when it is finalized the
fd will be closed (which by then may be reused and can be anything).

This also adds a note to Send() the the file is closed.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 1fb0bf1b3b7ba2f5188bb58ef8d6991173e6b0f2
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes 7ceb7e67ea beam: more unit tests 
This adds testing to SendConn.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a88d8d678b4f168885a65f8bb13720f282725355
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes 2b6efd6fe0 beam/examples/beamsh: add scripts to reproduce various bugs 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 06df94d55b6a1ec10faf4672ebe7fcaf7fb62ab7
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes a7e559b7d2 beam/examples/beamsh: fix 'print' to be pass-through 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: d0ca66dded29c3e5e2f78d99e9cc9205484c3b5f
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes df4d4ec486 beam/examples/beamsh: rename 'log' to 'logger' to avoid conflict with stdout/stderr 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: b97375fc29a88f896e14f45a34c263a4948c9ad9
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes 05ff9d4c14 beam/examples/beamsh: 'prompt' asks the user for a value and sends it. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a2b88b4915acf7b1c1a165dd9193f416e5b99e3c
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes efaa77908b beam/examples/beamsh: commands are messages. 
Commands in the pipeline should either implement or pass-through command messages.

This amounts to a proof-of-concept implementation of the "pipeline"
design of Docker plugins.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ed62ca5b2f673fde54c2ffc5edaf0e5bcbd1b721
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes 4c6e97a76f beam/examples/beamsh: cosmetic fix in Fatalf 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2f4b8b7e8dbdc1861ee83b63d92ab0921045861f
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes dd8f545bb2 beam: replace SendPair() with the simpler SendConn() 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4f92ffb50036f313a51020e1bfdcad7b10db65fb
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes d1f6c39cc9 beam/examples/beamsh: miniserver.ds demo 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 5833e7888725dcb7d0bfd3f23087deed73a75328
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes 4b5530e072 beam: improve the API with Sender/Receiver interfaces and utilities: Copy/SendPipe/SendPair 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 70d32621615506b6622380ed6021f63be67e6e23
Component: engine
 2014-04-22 15:50:21 -07:00
Alexander Larsson 3822f04f53 beam: Make extracted Fds CloseOnExec 
Grab forklock to make sure no forks accidentally inherit the new fds
before they are made CLOEXEC There is a slight race condition between
ReadMsgUnix returns and when we grap the lock, so this is not
perfect. Unfortunately There is no way to pass MSG_CMSG_CLOEXEC to
recvmsg() nor any way to implement non-blocking i/o in go, so this is
hard to fix.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: b0228d94beeeb331f6ac58b289eba4982a42c5d4
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes 1695eb64ac beam/examples/beamsh: add a few example dockerscripts 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 207e604bad1bf5d69c139cb17568cfc473a391ba
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes dd65dea1c6 beam/examples/beamsh: simplify code by using sendWPipe utility 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 29ddf2be1e9b9349865e3d0f34b1d4fc0b960ee3
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes aed648b82b beam/examples/beamsh: move code around for readability 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1dc449e11dfaf9b376b953322b4bab19e88f7d94
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes 609fa308ff beam/examples/beamsh: 'exec' adds 'fromcmd' field to its output 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3a2b31a30b49f02f6043be5790fd2a123c2c5eae
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes ab1a9fa4e1 beam/examples/beamsh: simple 'log' command tees streams to a local directory 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 7534f7a34b2f0d5eac5e59c1a686adc6f4410d26
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes 0fd013996b beam/examples/beamsh: 'render' and 'beamsh -x' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4f5b94d3690e3ccdcc23b68d9635dfa37b6dd0e4
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes 75bca8866b beam/examples/beamsh: run commands in an implicit context of pre-loaded 'plugins' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4ebe7aab91b67048ea0d2bbec13bfb1d79787f11
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes 1875fe5b4e beam/examples/beamsh: convenience commands 'devnull', 'echo' and 'stdio' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: cd85af06fe693d849766348e505607f3bd4ff3fc
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes 6679196850 beam/examples/beamsh: 'emit' supports key=value syntax to compose arbitrary objects 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6d9cdbf24f1f99dd42788afcadc300128175f42f
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes 31e10ad323 dockerscript: '=' is not a special character 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2b81fb8424eb4ba8c815c856075509d686c383a0
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes e69a2729d2 beam/examples/beamsh: support for background commands with '&' terminator 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6e0a156d9086300a34b0e1f441dd5150dde57be1
Component: engine
 2014-04-22 15:50:20 -07:00