docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
6,221 Commits 12 Branches 295 Tags
efed40e022e5d427b01d2142dddd67f75f74507d
Commit Graph

5746 Commits

Author SHA1 Message Date
Matthias Kühnle
efed40e022 Fixed misspelling 
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
Upstream-commit: 8a3cb0c65e7940e928e31d6e64cce5d81d9975a6
Component: engine
 2014-02-18 11:38:23 +01:00
Matthias Kühnle
e8870b2f18 Env Clarification 
Clarified that the env variables here are an example output of env. The user should not set them to the example values.

Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
Upstream-commit: a7f1b74dd812fbc86beefea6fcd3ba4c4abaa7e2
Component: engine
 2014-02-18 11:36:46 +01:00
Tianon Gravi
1b472eb342 Merge pull request #4123 from tianon/darwin-shasum 
Add shasum fallback to hack/make/dynbinary for Darwin
Upstream-commit: 32535e0b826a68973f59c4529418614453819750
Component: engine
 2014-02-13 21:20:49 -07:00
unclejack
f55687f256 Merge pull request #4135 from creack/console_support 
Mount-bind the PTY as container console - allow for tmux/screen to run
Upstream-commit: 7aff7cc4bbc0e78c72e77429a79c32a7e7cfc0dc
Component: engine
 2014-02-14 03:47:33 +02:00
unclejack
fe6b466dfb Merge pull request #4134 from crosbymichael/fix-add-magic-regression 
Fix regression with ADD of tar files
Upstream-commit: 1b8ec8ff1db1ddfd015b7079e39270672692fc70
Component: engine
 2014-02-14 03:43:39 +02:00
Michael Crosby
308d858c86 Merge pull request #4128 from vieux/fix_header_content-type_api 
Fix header content type api
Upstream-commit: 968f4800b51feb62916d1df83c5fbf17368ee6e1
Component: engine
 2014-02-13 20:29:09 -05:00
Guillaume J. Charmes
3dbd63bc33 Mount-bind the PTY as container console - allow for tmux/screen to run 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 408ea0771a9cb3046b8e484dcfefe5233fcbb27a
Component: engine
 2014-02-13 17:23:09 -08:00
Michael Crosby
20b4cea323 Fix regression with ADD of tar files 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cad7f7ee5002206511daee4a29f399e6665f5fab
Component: engine
 2014-02-13 17:18:38 -08:00
Andy Rothfusz
8326694294 Merge pull request #4120 from apocas/master 
Image tag endpoint HTTP code typo
Upstream-commit: a4d1da709eae456888a3bdc35cd7a04a06ead7cb
Component: engine
 2014-02-13 15:49:45 -08:00
Tianon Gravi
8158393ebb Merge pull request #4093 from stpierre/mkimage-yum 
Fix bogus variable reference in mkimage-yum.sh
Upstream-commit: cc144418456d9c93b80e291e3f24750a41658665
Component: engine
 2014-02-13 15:28:47 -07:00
Tianon Gravi
a3e904b8c7 Merge pull request #4125 from maxamillion/maxamillion/add_redhat_sysvinit 
Remove unneeded sysctl changes in sysvinit-redhat init script
Upstream-commit: 8d2a2ed457346cd4156cf71b87a06e38536eaeb6
Component: engine
 2014-02-13 12:53:53 -07:00
Guillaume J. Charmes
3670248b8d Merge pull request #4108 from unclejack/remove_default_tcp_bind_address 
disallow tcp:// from defaulting to 127.0.0.1:4243
Upstream-commit: 6cb0a7e04e23ea6bc8694a6a7489ce226e01151e
Component: engine
 2014-02-13 11:44:31 -08:00
Victor Vieux
6ca6193a8d fix content-type for legacy 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0b403b35318a68d848bd9d7cddcf850d2fa7bfa7
Component: engine
 2014-02-13 19:24:40 +00:00
Victor Vieux
1395c9829d fix content-type for job.Stdout.Add 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4611a6bdd3270e4a404cae2d23c54dd94521c4ae
Component: engine
 2014-02-13 19:21:27 +00:00
Guillaume J. Charmes
c0c4c69b1a Merge pull request #4062 from alexlarsson/clean-shutdown 
devmapper: Fix shutdown warnings
Upstream-commit: 9997d0c9ed031465b7bc6e4df6f62bcac3758305
Component: engine
 2014-02-13 10:45:03 -08:00
Victor Vieux
83b45e3c01 Merge pull request #4103 from vieux/add_error_build-rm 
add error to docker build --rm
Upstream-commit: 6f10f33387becb3a8470f9f65706d0df919b7e9b
Component: engine
 2014-02-13 10:35:55 -08:00
Adam Miller
f734c53533 remove unneeded sysctl changes in sysvinit-redhat init script 
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com> (github: maxamillion)
Upstream-commit: 4317011e21b4e4025a9c92c7dc255fbf62af573a
Component: engine
 2014-02-13 12:11:38 -06:00
apocas
9d6155e45c Image tag endpoint doc typo. 
Docker-DCO-1.1-Signed-off-by: Pedro Dias <petermdias@gmail.com> (github: apocas)
Upstream-commit: 3417dd4b3bef88d4da0deac520bbf150ba9c183b
Component: engine
 2014-02-13 18:11:07 +00:00
Michael Crosby
b26dffeb65 Merge pull request #4096 from alexlarsson/fix-devmapper-race-2 
Avoid extra mount/unmount during build
Upstream-commit: 3f1e6b63682b54bc245e805a0ee5d6422203fd45
Component: engine
 2014-02-13 12:53:29 -05:00
Tianon Gravi
173cbcacdb Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not available) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c7840f522c37d2c964e442c5acac745f702b8801
Component: engine
 2014-02-13 10:27:45 -07:00
Tianon Gravi
1e6f0f8de2 Merge pull request #4043 from tianon/hack-git-detection-and-use 
Add better ".git" detection and use
Upstream-commit: f794fbc2306e633916b7f000d441d234e198fc24
Component: engine
 2014-02-13 09:56:14 -07:00
unclejack
3c5478c15e Merge pull request #4056 from alexlarsson/fix-devmapper-test 
devicemapper: Fix tests on fedora
Upstream-commit: 47df7a360ad10660639af4bef32afaa29b16ee1c
Component: engine
 2014-02-13 15:06:50 +02:00
unclejack
972ffb5ee2 Merge pull request #4073 from crosbymichael/fix-docker-cp-close 
Ensure docker cp stream is closed properly
Upstream-commit: c6edac9a1a33835e7ab0ea3173877f9731ec45a5
Component: engine
 2014-02-13 14:12:53 +02:00
unclejack
171ba8d692 disallow tcp:// from defaulting to 127.0.0.1:4243 
This stops docker from accepting tcp:// as a valid bind address.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 31dde3ea05e1cf4c1f45083c1b6129e8c2a362df
Component: engine
 2014-02-13 13:54:37 +02:00
Andy Rothfusz
93967c393a Merge pull request #4111 from merriam/patch-4 
Minor error in example code (resubmit #4109)
Upstream-commit: cddea301ab4a4d5ba32c1d1bb22f029fcf1a8edd
Component: engine
 2014-02-12 18:34:17 -08:00
Charles Merriam
60f7a02d07 Minor error in example code (resubmit #4109) 
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com> (github: merriam)
Upstream-commit: ba650e05177bcc2597606b998a104a29698d5064
Component: engine
 2014-02-12 18:13:46 -08:00
Charles Merriam
8934e64a02 (resubmit) Add notes about OS/X and remote daemons 
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com> (github: merriam)
Upstream-commit: 2a17bdce9e6e25e9be225fede7aac0b12729d82f
Component: engine
 2014-02-12 18:11:01 -08:00
Andy Rothfusz
9cd54a87e2 Merge pull request #4090 from SvenDowideit/add-install-make-git-to-devenv 
tell the reader that they need git and make for this tutorial
Upstream-commit: 989fee2490b0d4ed6fd76e668ace6769f7d908ee
Component: engine
 2014-02-12 15:48:39 -08:00
Victor Vieux
1e41d2ac04 add error to docekr build --rm 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a895c7238d3f32b22989c409a5a3b09aa3463054
Component: engine
 2014-02-12 23:23:42 +00:00
Adam Miller
536d661ab7 Merge branch 'master' into maxamillion/add_redhat_sysvinit 
* master: (64 commits)
  Move the canonical run configuration objects to a sub-package
  Remove useless code in client implementation of 'run'.
  pkg/opts: a collection of custom value parsers implementing flag.Value
  Move api-specific code to the api package
  Fix the tests, too
  Fix the one spot I missed dockerversion
  fix underline/heading
  New package `nat`: utilities for manipulating the text description of network ports.
  rewrite the PostgreSQL example using a Dockerfile, and add details to it
  Move even more stuff into dockerversion
  fix underline/heading
  Move docker version introspection to a sub-package.
  add port forwarding notes for mac/boot2docker docs
  Update remote_api_client_libraries.rst
  Avoid extra mount/unmount during container registration
  add a little more information about the docker run -P option
  lxc: Drop NET_ADMIN capability in non-privileged containers
  devmapper: Remove directory when removing devicemapper device
  add a little info on upgrading
  point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
  ...
Upstream-commit: e36d4d88219192269599c7273bcba4f5fcf0fb4e
Component: engine
 2014-02-12 12:04:02 -06:00
Adam Miller
b2a134f727 Added sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.) 
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com> (github: maxamillion)
Upstream-commit: 2222cba5acd3fe663d492d7bc3fd4787d4c9869f
Component: engine
 2014-02-12 12:03:32 -06:00
Alexander Larsson
22e2031a29 Avoid extra mount/unmount during build 
CmdRun() calls first run() and then wait() to wait for it to exit,
then it runs commit(). The run command will mount the container and
the container exiting will unmount it. Then the commit will
immediately mount it again to do a diff.

This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036.

To ensure that we only unmount once we split up run() into create()
and run() and reference the mount until after the commit().

With this change docker build on devicemapper is now race-free, and
slightly faster.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 59347fa66dfdd059c270a5f72e24320b4d0203ea
Component: engine
 2014-02-12 16:02:53 +01:00
Chris St. Pierre
8f6a38f17a Fix bogus variable reference in mkimage-yum.sh 
Fixes this: d419da7227 (commitcomment-5344982)

Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
Upstream-commit: 85263cdee894d1f1e3bca21a8d18264ef530c4d5
Component: engine
 2014-02-12 08:02:36 -05:00
Sven Dowideit
3648d21c65 tell the reader that they need git and make for this tutorial 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: d9f215eb2a48e6e836af9cc4015c73f17dc5be9e
Component: engine
 2014-02-12 16:30:18 +10:00
Michael Crosby
d08749138a Merge pull request #4085 from shykes/separate-config-hostconfig 
Move canonical run configuration objects to a sub-package
Upstream-commit: d3c084beeec1b89940f304b3d123f5f810fe5ff8
Component: engine
 2014-02-11 23:37:40 -05:00
Michael Crosby
138c42e7c0 Merge pull request #4089 from shykes/autopull-useless-code 
Remove useless code in client implementation of 'run'.
Upstream-commit: 19755bcdae9cb1b8ce28d068cf83d16fcf7273e9
Component: engine
 2014-02-11 23:23:12 -05:00
Solomon Hykes
e378922981 Move the canonical run configuration objects to a sub-package 
* Config is now runconfig.Config
    * HostConfig is now runconfig.HostConfig
    * MergeConfig is now runconfig.Merge
    * CompareConfig is now runconfig.Compare
    * ParseRun is now runconfig.Parse
    * ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
    * ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob

This facilitates refactoring commands.go and shrinks the core.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6393c38339e11b4a099a460ecf46bb5cafc4283b
Component: engine
 2014-02-11 20:18:46 -08:00
Solomon Hykes
15bba51638 Remove useless code in client implementation of 'run'. 
This facilitates refactoring commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e3140e1e69b24f32ffcc2dd94b7d82ad9305a7bc
Component: engine
 2014-02-11 20:16:58 -08:00
Victor Vieux
5c232a828b Merge pull request #4074 from shykes/separate-version 
Move docker version introspection to a sub-package.
Upstream-commit: 9a9690360c9b013f3962bee74c18397bd411cc6b
Component: engine
 2014-02-11 20:16:00 -08:00
Solomon Hykes
faccead7fb pkg/opts: a collection of custom value parsers implementing flag.Value 
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e6e320acc757f22e113da755293583402c6c1e7c
Component: engine
 2014-02-11 19:59:52 -08:00
Solomon Hykes
cbe391a3ed Move api-specific code to the api package 
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e08a1c53aa5a19a17d40d41accbab040611c4411
Component: engine
 2014-02-11 19:59:52 -08:00
Tianon Gravi
e8ca8bfeb8 Fix the tests, too 
Seriously.  There's not much codebase left we haven't touched.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0d871840b202fc31418990bbcbe0df1c4ad689fb
Component: engine
 2014-02-11 19:10:23 -07:00
Michael Crosby
a5dcd8d987 Merge pull request #4079 from shykes/separate-nat 
New package `nat`: utilities for manipulating the text description of network ports
Upstream-commit: 6da1e092dc222b17a296009de55d8216dfcfe612
Component: engine
 2014-02-11 20:45:58 -05:00
Tianon Gravi
2b6a0d82a2 Fix the one spot I missed dockerversion 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7ea725fdc530e989516fae60f5dafecb139d75b8
Component: engine
 2014-02-11 18:23:17 -07:00
Andy Rothfusz
1cb1e79554 fix underline/heading 
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 6fd8e5d976e872447447d8c25d20d525305f281d
Component: engine
 2014-02-11 16:53:08 -08:00
Solomon Hykes
944b4ea1c7 New package nat: utilities for manipulating the text description of network ports. 
This facilitates the refactoring of commands.go

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3ecd8ff0c80c593e1874cbfa0cc2abf946eeaf66
Component: engine
 2014-02-11 16:51:01 -08:00
Andy Rothfusz
c691ff08d3 Merge pull request #4034 from SvenDowideit/postgres-example 
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Upstream-commit: e9e4b8dc15fcf01fb793cd65ebfa822420d56fe8
Component: engine
 2014-02-11 16:49:22 -08:00
Sven Dowideit
afbabaccff Merge pull request #4050 from SvenDowideit/put-back-LGTM 
bring back the explanation of our LGTM process
Upstream-commit: 6b925a49919ae12129e915ce542c7280faf99641
Component: engine
 2014-02-12 10:41:49 +10:00
Sven Dowideit
afe2170b4f rewrite the PostgreSQL example using a Dockerfile, and add details to it 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 2ed2ba4e8caa2d70d57d124a2f3509f400d8187e
Component: engine
 2014-02-12 10:30:57 +10:00
Andy Rothfusz
da8055c21a Merge pull request #3988 from dafyddcrosby/fix_formatting 
Fix RST formatting
Upstream-commit: 73967417579a44a4597e8d3e818248f8c98a1c97
Component: engine
 2014-02-11 16:30:21 -08:00