5765efce31
Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc
...
Add the registry mirror document to the menu
Upstream-commit: 196cdf145032f64c0b45cf4f3bd87193cfa8d124
Component: engine
2015-01-27 20:29:25 -05:00
6813c73a03
Add the registry mirror document to the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1d04cc513a958009131ca54bd6904be14fef774e
Component: engine
2015-01-28 10:47:11 +10:00
0388864ff5
Merge pull request #10322 from dmcgowan/v2-manifest-tarsum-cache
...
V2 manifest tarsum cache
Upstream-commit: b3402f34b2049a0e82a061640f04c707b8cca99b
Component: engine
2015-01-27 16:40:49 -08:00
adf36f2445
Merge pull request #10369 from mcfiredrill/etc-host-typo
...
fix /etc/host typo in remote API docs
Upstream-commit: 3ac5596fe05a910a91f021de10b2c6cd16eacb07
Component: engine
2015-01-27 18:35:16 -05:00
f7f3e75906
Merge pull request #10373 from chenhanxiao/docker-build-typo
...
docs: fix a typo in docker-build man page
Upstream-commit: b2b284b5cdb1df2bbde896bff6dbbe87a8853a71
Component: engine
2015-01-27 18:25:55 -05:00
36a2c69c23
Merge pull request #10371 from jlhawn/fix_build_output_10364
...
Fix premature close of build output on pull
Upstream-commit: e54d1629415d82bada1952bd7be7ccfdc21dd015
Component: engine
2015-01-27 15:09:17 -08:00
77b0c4eb7e
Merge pull request #10383 from cpuguy83/update_m2dman
...
Update go-md2man
Upstream-commit: 8f7cf87fd90a2d86f51e8a121ad759f4b1ab5265
Component: engine
2015-01-27 13:59:58 -08:00
c589d39732
Merge pull request #10230 from tianon/emptyfs
...
Update emptyfs support to work properly if scratch is already an image
Upstream-commit: bb4025c4e206cf46de3ba3267efb3df96db45b91
Component: engine
2015-01-27 15:01:42 -05:00
29be632832
Merge pull request #10249 from jlhawn/distribution_version_header_10247
...
Split API Version header when checking for v2
Upstream-commit: b9650ad40bd4db3b570f30b158eb9494bb06da8c
Component: engine
2015-01-27 11:48:42 -08:00
dbb2daa29d
Merge pull request #10197 from vbatts/vbatts-dm_cookie_support
...
devicemapper: API for cookie support
Upstream-commit: c81fb7fa4a41dfdc21eb37dade0eb71bd1dfa855
Component: engine
2015-01-27 11:44:03 -08:00
2e68f2825a
Merge pull request #10113 from imreFitos/master
...
docs: remove NAT rule when removing bridge
Upstream-commit: e04cc93a2c92638bb00af8bae8f5a165ed036bfa
Component: engine
2015-01-27 11:22:53 -08:00
ed313f44e2
Merge pull request #10370 from ashahab-altiscale/9875-apparmor-regression
...
Fixes apparmor regression
Upstream-commit: 83bec40e86a8773b787cf40881dec2c8ece4ced9
Component: engine
2015-01-27 10:46:22 -08:00
6c59418704
Use layer checksum if calculated during manifest creation
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: ab589b442d55597de74201729ba893977ea73b7f
Component: engine
2015-01-27 10:21:35 -08:00
3c4927bcb2
Fix premature close of build output on pull
...
The build job will sometimes trigger a pull job when the base image
does not exist. Now that engine jobs properly close their output by default
the pull job would also close the build job's stdout in a cascading close
upon completion of the pull.
This patch corrects this by wrapping the `pull` job's stdout with a
nopCloseWriter which will not close the stdout of the `build` job.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e662775ffb096fdb4a7f247bb25b8e3022006c1b
Component: engine
2015-01-27 10:07:01 -08:00
dd5b8c65d4
Update go-md2man
...
Update fixes some rendering issues, including improperly escaping '$' in
blocks, and actual parsing of blockcode.
`ID=$(sudo docker run -d fedora /usr/bin/top -b)` was being converted to
`ID=do docker run -d fedora/usr/bin/top -b)`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e8ca04f5764c150b61b1b05785fb3926613fa1
Component: engine
2015-01-27 09:33:42 -05:00
bdc325d2e4
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: dcfa881a7b12e9a737b25ada98ec0c76e58c9c9c
Component: engine
2015-01-27 11:19:02 +08:00
332ce60368
Merge pull request #10362 from LK4D4/update_libcontainer
...
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
Upstream-commit: acb8e08296b2570d109af3fdb447f470fdb5f665
Component: engine
2015-01-26 17:18:00 -08:00
aa7720d90d
fix /etc/host typo in remote API docs
...
Signed-off-by: Tony Miller <mcfiredrill@gmail.com >
Upstream-commit: 87d2adf070a44d3d62dfe7ca8c13e95e92f53b64
Component: engine
2015-01-27 10:12:54 +09:00
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
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
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
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
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
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
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
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
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
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
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
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
c036119857
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
...
This revision is from docker_1.5 branch, because we don't want to
introduce user namespace in docker 1.5, but fix for --pid=host is
needed.
Fixes #10303
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: fd2d45d7d465fe02f159f21389b92164dbb433d3
Component: engine
2015-01-26 14:00:44 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
James Turnbull
Sven Dowideit
Michael Crosby
Alexander Morozov
Tibor Vass
Jessie Frazelle
Derek McGowan
Josh Hawn
Brian Goff
Chen Hanxiao
Tony Miller
Sven Dowideit
Sven Dowideit
unclejack
Arnaud Porterie
Alexander Morozov
Michael Crosby
unclejack
Euan