toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,825 Commits 3 Branches 295 Tags
e7f0104567b8a36f89cbfc08da2153c02c09fd78
Commit Graph
12825 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessica Frazelle e7f0104567 Move one last exec test :) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6a2c6e971d8b760931402e15513e91c71cba4b72
Component: engine
 2015-01-26 17:17:08 -08:00
Sven Dowideit b740a402ee Merge pull request #10344 from SvenDowideit/pr_out_change_to_load_the_json_gz_file 
Change to load the json.gz file
Upstream-commit: a79d363d2dca151d4e0056e3ebd0481b6046e26f
Component: engine
 2015-01-27 11:12:07 +10:00
James Turnbull 1565e00fb1 Merge pull request #10343 from unclejack/shrink_sprites-small_360 
docs: shrink sprites-small_360.png
Upstream-commit: c48f61cb7a22cebd7f8074f481e69a62122ed70e
Component: engine
 2015-01-26 19:28:40 -05:00
Sven Dowideit 2bb1b521d1 Merge pull request #10272 from mcfiredrill/document-extrahosts-remote-api 
document the ExtraHosts parameter for /containers/create for the remote ...
Upstream-commit: f3fef3127742a2128990d6f824681695478833bc
Component: engine
 2015-01-27 10:25:00 +10:00
Sven Dowideit bb8e8fc2eb as we're not using the search suggestion feature only load the search_content when we have a search ?q= param 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 60089ace4895d9ab9c9fe9f2fb4b0db8a0d9aeda
Component: engine
 2015-01-27 09:57:45 +10:00
Sven Dowideit 995b6fcdbf set the content-type for the search_content.json.gz 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 64f67af2b2bab7c9d3b4458b194c10f7428bf257
Component: engine
 2015-01-27 09:57:44 +10:00
Sven Dowideit 763fcb05c8 Change to load the json.gz file 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a78130467a03b95d1852bb2e6d10120bd8e6a6e7
Component: engine
 2015-01-27 09:57:44 +10:00
unclejack 124596416c docs: compress search_content.json for release 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

Docker-DCO-1.1-Signed-off-by: unclejack <unclejacksons@gmail.com> (github: SvenDowideit)
Upstream-commit: 1e41d57bd44bd503d0642c8ea20123541c146218
Component: engine
 2015-01-27 09:57:43 +10:00
Michael Crosby a3cfeb1217 Merge pull request #10361 from dmcgowan/v2-registry-errors 
Better error messaging and logging for v2 registry requests
Upstream-commit: 70ea474de9bb7474d8859a05e98d21f98a05c7eb
Component: engine
 2015-01-26 15:38:22 -08:00
Michael Crosby 76b4f43eee Merge pull request #10261 from cpuguy83/fix_volume_err_on_symlink_eval 
Do not return err on symlink eval
Upstream-commit: 3466baafc16ff4592f2b5714dd74f781d67487bc
Component: engine
 2015-01-26 15:12:46 -08:00
Michael Crosby b2ffb55f86 Merge pull request #10360 from dmcgowan/keyfile-error-message 
Add file path to errors loading the key file
Upstream-commit: e15300b251e813cd8b262832fccc8af475979f1c
Component: engine
 2015-01-26 14:44:07 -08:00
Arnaud Porterie c4558ad58c Merge pull request #10305 from jlhawn/use_tarsum_v1 
Always store images with tarsum.v1 checksum added
Upstream-commit: bfa0dc47da2d9e6399fa32bda72a7074224c815d
Component: engine
 2015-01-26 14:42:07 -08:00
Derek McGowan e63f5dfefb Better error messaging and logging for v2 registry requests 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d277714614f62dba276227f70cc2a47eac6e02e7
Component: engine
 2015-01-26 14:00:51 -08:00
Michael Crosby c82f5400cc Merge pull request #10327 from dmcgowan/progress-reader-fix 
Revert progressreader to not defer close
Upstream-commit: db6ecffc69ce0367623ee7d4686e54128af16470
Component: engine
 2015-01-26 13:07:12 -08:00
Michael Crosby 0e4ec3c5e2 Merge pull request #10359 from crosbymichael/stats-json 
Remove omitempty json tags from stucts
Upstream-commit: 1c9e16f00f6f64f2905a52e269192e52df085a7d
Component: engine
 2015-01-26 13:06:47 -08:00
Derek McGowan ff273f30e2 Add file path to errors loading the key file 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a90e91b500bb1a39a7726025973b5748148768c1
Component: engine
 2015-01-26 12:58:45 -08:00
Brian Goff c124b59c51 Do not return err on symlink eval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b54305ae2330bcadd2ef657a17f4a87896031d1f
Component: engine
 2015-01-26 15:22:32 -05:00
Michael Crosby cb736412ed Merge pull request #10323 from dmcgowan/path-v-filepath-fix 
Use filepath instead of path
Upstream-commit: 949f2ca8cbddadc00f9430b6f5ce50fd5a5dcb52
Component: engine
 2015-01-26 11:56:14 -08:00
Arnaud Porterie 68915fde41 Merge pull request #10335 from euank/EmptyLayerConfig 
Allow empty layer configs in manifests
Upstream-commit: 74014e4a92fc600259605e4201ea6a70b4e623d3
Component: engine
 2015-01-26 11:53:36 -08:00
Michael Crosby 01dd112057 Merge pull request #10309 from cpuguy83/fix_bind_vol_partially_removed 
Fix bind-mounts only partially removed
Upstream-commit: ed8e89c54d975cfd84b0dc5d3e59ac754341f940
Component: engine
 2015-01-26 11:53:08 -08:00
Jessie Frazelle 97b46187a0 Merge pull request #10331 from DiuDiugirl/master 
Fix a minor typo
Upstream-commit: 8b031eb89215d3914e897dc82ca477b442c92644
Component: engine
 2015-01-26 11:52:18 -08:00
Michael Crosby 00cef48e11 Merge pull request #10295 from ashahab-altiscale/9875-lxc-exit-code 
Adds ipc namespace capability to lxc, and fixes tests.
Upstream-commit: 364c64cf1aa912ea8197caa6b23b96e20ead64fb
Component: engine
 2015-01-26 11:21:48 -08:00
Michael Crosby 67effd66f9 Remove omitempty json tags from stucts 
When unmarshaling the json response from the API in languages to a
dynamic object having the omitempty field tag on types such as float64
case the key to be omitted on 0.0 values.  Various langages will
interpret this as a null when 0.0 is the actual value.

This patch removes the omitempty tags on fields that are not structs
where they can be safely omited.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 44f4c95c0ece887023d3ad7ab9c4f147c81d9d3f
Component: engine
 2015-01-26 11:16:29 -08:00
Michael Crosby 7f109df3b1 Merge pull request #10194 from jfrazelle/lxc-test-fixes 
ignore exec tests when passing DOCKER_EXECDRIVER lxc
Upstream-commit: a3c5223b2a7f2a31c77910e93c2229bf01c41955
Component: engine
 2015-01-26 11:07:52 -08:00
Brian Goff cc5294bd01 Fix bind-mounts only partially removed 
When calling delete on a bind-mount volume, the config file was bing
removed, but it was not actually being removed from the volume index.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b4283209d55289abb2c5b63df949a27c2704f5af
Component: engine
 2015-01-26 12:38:20 -05:00
Arnaud Porterie d3ac88b1d5 Merge pull request #10290 from tianon/sorry-windows-norelease4u 
Remove windows from the list of supported platforms
Upstream-commit: 94e169b44f3bcc346c7d0f9a733a8c76f1eace55
Component: engine
 2015-01-26 08:44:08 -08:00
James Turnbull 917ff61a98 Merge pull request #10333 from jlhawn/image_json_schema_reword 
Updated image spec docs to clarify image JSON
Upstream-commit: 283597ad37446ccad57f6ba881652ee6f67e576e
Component: engine
 2015-01-26 07:49:44 -05:00
unclejack e04792e240 docs: shrink sprites-small_360.png 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 6bbf19dfbe44a06dadb755e08069b5ee031f5312
Component: engine
 2015-01-26 08:11:20 +02:00
unclejack 5933252d75 Merge pull request #10330 from unclejack/remove_autodetect_log 
pkg/archive: remove tar autodetection log line
Upstream-commit: 8d5774e60bfcf4ec3fdd571f73424ef1adc586cb
Component: engine
 2015-01-26 07:25:22 +02:00
Jessie Frazelle 4bcd09aacc Merge pull request #10219 from albers/bash-completion 
Bash completion for the daemon flags
Upstream-commit: b1f2fdeee213c437a363db9eda235444ffdcc4a5
Component: engine
 2015-01-25 10:25:22 -08:00
Euan 3bf93236d1 Allow empty layer configs in manifests 
Before the V2 registry changes, images with no config could be pushed.
This change fixes a regression that made those images not able to be
pushed to a registry.

Signed-off-by: Euan Kemp <euank@euank.com>
Upstream-commit: d477d42dd3e6a98f82c6ed2abb1dfeeb2782539f
Component: engine
 2015-01-24 14:27:37 -08:00
Josh Hawn f145851625 Updated image spec docs to clarify image JSON 
The title `Image JSON Schema` was used as a header in the section
which describes the layout and fields of the image metadata JSON
file. It was pointed out that `JSON Schema` is its own term for
describing JSON in a machine-and-human-readable format, while the
word "Schema" in this context was used more generically to say that
the section is meant to be an example and outline of the Image JSON.

http://spacetelescope.github.io/understanding-json-schema/

This section now has the title `Image JSON Description` in order
to not cause this confusion.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 71763636f232477b0c890e0506b7b858505f1b33
Component: engine
 2015-01-24 10:21:11 -08:00
DiuDiugirl 193affd9cc Fix a minor typo 
Docker inspect can also be used on images, this patch fixed the
minor typo in file docker/flags.go and docs/man/docker.1.md

Signed-off-by:  DiuDiugirl <sophia.wang@pku.edu.cn>
Upstream-commit: 471006c02f03d9451721dfbd7e3d62f0db0fc7c7
Component: engine
 2015-01-24 15:08:33 +08:00
unclejack d9de984b24 Merge pull request #10315 from jfrazelle/overlay-zfs 
Blacklist zfs with overlay
Upstream-commit: 990a3e30fa66e7bd3df3c78c873c97c5b1310486
Component: engine
 2015-01-24 09:04:37 +02:00
unclejack 299d22c2cc pkg/archive: remove tar autodetection log line 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: a5cc1c556dcd6dfe5c1aed4bec95aaff6ddfad61
Component: engine
 2015-01-24 08:43:03 +02:00
Derek McGowan 45af1fde18 Revert progressreader to not defer close 
When progress reader closes it overwrites the progress line with the full progress bar, replaces the completed message.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 0091c490dd31b9b9a5248cacaaf1f515ff26a5e7
Component: engine
 2015-01-23 17:24:05 -08:00
Jessica Frazelle 36ea1c732a Move links exec test & exec dir test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 43d1c2010125e3c1ef1013ee2e8b4d9371d70d77
Component: engine
 2015-01-23 16:20:46 -08:00
Jessica Frazelle 83a3f5c28f Update project/make.sh to use execdriver buildtag if passed. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 547c95957679672c3ed2e97c7a2950d3c0a03321
Component: engine
 2015-01-23 16:18:39 -08:00
Jessica Frazelle 34351a6734 Add build flag to exec test. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ecdbc1a0aff40fa28389d1971528641e2824e5a9
Component: engine
 2015-01-23 16:18:39 -08:00
Jessica Frazelle 3e848a2a63 Move InspectExecID test to exec. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 957cbdbf302750f3fb3467237bebf29d87234208
Component: engine
 2015-01-23 16:18:39 -08:00
Alexander Morozov 9fa17b5deb Merge pull request #10321 from titanous/fix-err 
Fix missing err assignment in bridge creation
Upstream-commit: 30293e3fd0b03aa6bcd7b725fc2429e4cbeeb169
Component: engine
 2015-01-23 15:07:23 -08:00
Jonathan Rudenberg cc1de71aa0 Fix missing err assignment in bridge creation 
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Upstream-commit: d5c78a4c07929eda2d448f9b2a09fb3d65a75a2d
Component: engine
 2015-01-23 14:48:28 -08:00
Derek McGowan 3acf78c713 Use filepath instead of path 
Currently loading the trust key uses path instead of filepath. This creates problems on some operating systems such as Windows.

Fixes #10319

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2cd5b7dae80c5451b729a0be2ade03cbdf2c5c26
Component: engine
 2015-01-23 14:44:30 -08:00
Jessica Frazelle 56fd7d2515 Blacklist zfs with overlay 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ec953b0e7ba89ff3b13b3187d9cee0b8c232b4ff
Component: engine
 2015-01-23 14:00:15 -08:00
Michael Crosby c2c9f5b572 Merge pull request #10311 from jfrazelle/quiet-logs-registry 
Make debugs logs less verbose for registry
Upstream-commit: 62c50abf1382fb3a4cfb72131d0f1573a25ad000
Component: engine
 2015-01-23 13:56:31 -08:00
Jessica Frazelle 1c5b6614c3 Make debugs logs suck less. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c49cd3d2a51ad6d2304c24f7b609cde804a0d6c5
Component: engine
 2015-01-23 13:20:29 -08:00
Josh Hawn cc58d5c62d Always store images with tarsum.v1 checksum added 
Updates `image.StoreImage()` to always ensure that images
that are installed in Docker have a tarsum.v1 checksum.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: ba3bad66f92da057dba2a43ff9a512cf7ad72375
Component: engine
 2015-01-23 11:30:27 -08:00
Tony Miller 513e38914d document the ExtraHosts parameter for /containers/create for the remote API 
I think this was added from version 1.15.

Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
Upstream-commit: 54c10fe81d1894f9683293601a53a0d87a0d7fbd
Component: engine
 2015-01-23 23:52:04 +09:00
Alexander Morozov 566a151923 Merge pull request #10183 from miminar/safe-stop-kill 
Stop and Kill commands made robust
Upstream-commit: 99bffdf10ef31d80ae5d5bcb6dff64d49d4ae03e
Component: engine
 2015-01-23 06:32:51 -08:00
Michal Minar 28feccbe1b Stop and Kill commands made robust 
If stop/kill command hits a short window between process' exit and
container's cleanup, it will no longer fail with 'no such process'
error.

Resolves #10182

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 310337dc89a78cbe245977236f02dcda73728df8
Component: engine
 2015-01-23 10:26:13 +01:00