3f7b51a04e
Merge pull request #10152 from ashahab-altiscale/9875-cap-add-all
...
SEND CAPABILITY IDS TO LXC
Upstream-commit: 979a4cdacdea48e401715ad887b43ee0b4bb513a
Component: engine
2015-01-19 10:46:22 -08:00
a9b7d25bb0
Merge pull request #10138 from ShockwaveNN/patch-1
...
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
2015-01-19 10:53:15 -05:00
681db1e57f
Merge pull request #10167 from bgazzera/master
...
There was a missing command to re-run the web container.
Upstream-commit: 6286c0711f2abc4a427ba4064b2a5f3d478c4034
Component: engine
2015-01-19 10:50:08 -05:00
e9a3b78432
Merge pull request #10179 from viirya/trivial_typo
...
Fix typo in document
Upstream-commit: 505e0ca80f50996f020e4d877e5efbd57b575d2f
Component: engine
2015-01-19 10:48:32 -05:00
b9a7e1b9ee
Fix typo.
...
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com >
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
2015-01-19 18:02:23 +08:00
a3290112e7
There was a missing command to re-run the web container.
...
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com >
Upstream-commit: 44cde56333fe891e087b8aa5ba914345bbdedbc0
Component: engine
2015-01-18 12:17:49 -03:00
5a9f9786e1
Merge pull request #10143 from cpuguy83/10129_marshal-indent_dockercfg
...
Make .dockercfg with json.MarshallIndent
Upstream-commit: 467b7c8213901ffd788dba1753ac08291c979ec0
Component: engine
2015-01-17 14:18:45 -08:00
40a61d0eec
Make .dockercfg with json.MarshallIndent
...
Fixes #10129
Makes the .dockercfg more human parsable.
Also cleaned up the (technically) racey login test.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b8f7526fc6333e5b67282e5b73eee497dd13ec34
Component: engine
2015-01-17 07:05:56 -05:00
b873d45d82
Merge pull request #10154 from tianon/fix-x-usage
...
Fix "-X" 6l usage ("define string data")
Upstream-commit: 4245952f79106acd0f8125ad05b5f7560f7ae524
Component: engine
2015-01-16 20:55:16 -08:00
6136e835bf
Fix "-X" 6l usage ("define string data")
...
It turns out "-X" is only for strings! :)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: da01690a0a22ced060d4fb4fc46cb545ff1604df
Component: engine
2015-01-16 21:46:01 -07:00
807f07b041
SEND CAPABILITY IDS TO LXC
...
Sending capability ids instead of capability names ot LXC for --cap-add and --cap-drop.
Also fixed tests.
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Upstream-commit: bff3509e431ce6d68e2accbb842c99d4abe86e05
Component: engine
2015-01-17 04:01:52 +00:00
bba3a8213f
Merge pull request #10148 from thaJeztah/fix-deprecation-typo
...
Fix typo in deprecation message.
Upstream-commit: 78b7a484db5ac876e116eb248f1ba538bcc426a2
Component: engine
2015-01-16 15:16:54 -08:00
3968c04241
Fix typo in deprecation message.
...
Because the doc maintainers don't like Cockney.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bf14bacac3f1cae15ce7b32b5341122c305e630e
Component: engine
2015-01-16 23:36:50 +01:00
611f8510fe
Merge pull request #9941 from SvenDowideit/build-pull-option-docs
...
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
2015-01-16 13:49:56 -08:00
712286a324
Merge pull request #10125 from estesp/9960-add-backingfs-info
...
Add backing filesystem info to `docker info` command where applicable
Upstream-commit: eaf3c6f1aca3d2e3bd58300781dd31eec93622b1
Component: engine
2015-01-16 13:41:37 -08:00
310b2cd524
Add backing filesystem info to docker info command where applicable
...
Fixes #9960
This adds the output of a "Backing Filesystem:" entry to `docker info`
to overlay, aufs, and devicemapper graphdrivers. The default list
includes a fairly complete list of common filesystem names from
linux/include/uapi/linux/magic.h, but if the backing filesystem is not
recognized, the code will simply show "<unknown>"
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 48b1dd0084904678728817d728bb9ab1c0183aad
Component: engine
2015-01-16 14:43:43 -05:00
0af8067e20
Merge pull request #10134 from unclejack/bump_go_to_1.4.1
...
bump go to 1.4.1
Upstream-commit: 6a6a89a80686667cab70fa71dbcdfa408b252106
Component: engine
2015-01-16 19:35:47 +02:00
663b86fdb0
Merge pull request #10127 from fredlf/known-issues
...
Adds new section for Known Issues to Release Notes.
Upstream-commit: 30468cdbae6deced7d13a4b3e52033100fe593ec
Component: engine
2015-01-16 09:45:34 -05:00
4f77faa073
fix link to introducion on 'Working with Docker Images' page
...
Old link go to Table of content page, but by context it should go to 'understaning-docker' pag
Signed-off-by: Pavel Lobashov <shockwavenn@gmail.com >
Upstream-commit: 43b97368422843108a2090633367beaba434245b
Component: engine
2015-01-16 14:16:10 +03:00
f41baa0c49
bump go to 1.4.1
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 933f957e773d5b9da13e32649d0f987b30e87eb5
Component: engine
2015-01-16 09:45:37 +02:00
ce31e7fa97
Merge pull request #9937 from SvenDowideit/add-https-test
...
Add a containerised test for the https cert doc
Upstream-commit: 22437eb9609cdbf4ed221d07557e206bc0066e18
Component: engine
2015-01-15 17:53:40 -08:00
fe4979e250
Adds new section for Known Issues to Release Notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: f6777c7a40efdae161f6ba99223f4d6a625d4762
Component: engine
2015-01-15 16:09:48 -08:00
1964402004
Merge pull request #10104 from thaJeztah/docs-add-note-to-cli-export
...
Docs: Add note that export doesn't include volume data.
Upstream-commit: 9725433988b7d83bcbbf2af1976995efc0aadd4e
Component: engine
2015-01-16 12:15:46 +13:00
8333dd3c16
Merge pull request #9840 from nhsiehgit/searchapidocs
...
updated search api docs to include pagination changes
Upstream-commit: 25a8602cbabaec44d5646923b2ae1564a3ba7f8b
Component: engine
2015-01-15 17:40:04 -05:00
00273b496a
Merge pull request #10109 from ankushagarwal/imagespec-typo
...
Fix typos in image spec v1
Upstream-commit: 3837c080228143378b1041364a90aa5bcf59fa00
Component: engine
2015-01-15 08:58:29 -08:00
3b76395570
changed format of cli note
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: c252d5f3f4fc98062fbda6335a04cca2602a4223
Component: engine
2015-01-15 08:39:16 -08:00
3abcc54bab
Docs: Add note that export doesn't include volume data.
...
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.
This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.
Relates to https://github.com/docker/docker/issues/10095
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 67588d0ec4d73a8f2efb150d555c38b7ebfca7f6
Component: engine
2015-01-15 16:54:45 +01:00
647f575a6c
Typo creating -> created
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 82bfb3852ea0835d96d456c256f40633b020bd1e
Component: engine
2015-01-14 23:02:17 -08:00
14a514f68a
Merge pull request #10110 from jfrazelle/fix-vfs-issue
...
ignore vfs from graphdriver warning
Upstream-commit: ae493e721ee2cee68e06f0c2cc935c3e8de9d428
Component: engine
2015-01-14 19:54:17 -08:00
792af8c0a5
Add build --pull and evenets --filter flags to the docs for 1.4
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 18a2c77435cdad8f759421500cba6ac20057daf8
Component: engine
2015-01-15 15:20:48 +13:00
c72b573e2b
added note to man & cli docs on search limit
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 92ef40a8260e5e8dcd5579a6f9d942c4e68702ed
Component: engine
2015-01-14 18:03:09 -08:00
10d8a73193
ignore vfs from warning
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: f88066fd43454be005ec303977ee45561f3436e6
Component: engine
2015-01-14 17:28:50 -08:00
387cdea261
Typo image -> container
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 034466d356ecc5bc993f255c5ec5fb96e7327b8b
Component: engine
2015-01-14 17:18:11 -08:00
f71acef86e
Merge pull request #9881 from tianon/json-array-of-strings
...
Adjust builder to validate that JSON in Dockerfiles are arrays of strings and nothing else to match how we describe them to people (and what all our existing tests already assumed)
Upstream-commit: 640e0fc578e5acdaa71216a300396dfa9af8054f
Component: engine
2015-01-14 17:13:51 -08:00
e2b5d6afd7
Merge pull request #10108 from tiborvass/carry-9989
...
[Carry] Fix a panic where RUN [] would be supplied
Upstream-commit: eaecf741f0e00a09782d5bcf16159cc8ea258b67
Component: engine
2015-01-14 17:12:59 -08:00
28b575d46d
Merge pull request #10106 from icecrime/win_integration_tests
...
Fix some Windows integration tests
Upstream-commit: c126a2303fccc074f2382d01a2b685a1836cd621
Component: engine
2015-01-14 17:04:49 -08:00
a22356060c
Merge pull request #10107 from jfrazelle/9328-fix-try-start-paused-container
...
Error should show when trying to start a paused container.
Upstream-commit: 27f69b077703607862afa4a75c929ed07396ac2b
Component: engine
2015-01-14 17:02:23 -08:00
f2f058e60b
builder: use len() > 0 instead of != nil
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 3183af8b19d2adf29dd3fb80689d764353a3fe00
Component: engine
2015-01-14 16:55:56 -08:00
869bebb91c
Fix a panic where RUN [] would be supplied.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 39343b86182b4e997dc991645729ae130bd0f5f2
Component: engine
2015-01-14 16:55:56 -08:00
11776a4f9e
Error should show when trying to start a paused container.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 02246d2d9f9fe8eb040d1eb1ac4b7a84c3f3f059
Component: engine
2015-01-14 16:49:08 -08:00
7467fc1bd7
Take DOCKER_TEST_HOST into account
...
Tests no longer make the assumption that the daemon can be accessed
through unix:///var/run/docker.sock.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e1ef33449f484678d236cb49e80daf5ba1e1899c
Component: engine
2015-01-14 16:14:27 -08:00
2a3eb3ae39
Merge pull request #10093 from crosbymichael/readonly-containers
...
Add --read-only for read only container rootfs
Upstream-commit: 95c0f07966035ce79c6b51a2eee8c60c59fb523c
Component: engine
2015-01-14 15:56:51 -08:00
2ef8faf6e3
Add --readonly for read only container rootfs
...
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly. This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted. This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.
Closes #7923
Closes #8752
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 409407091a7282d0c4086b71e86397e2d089ba13
Component: engine
2015-01-14 15:41:31 -08:00
d149e702e3
Merge pull request #10101 from LK4D4/fix_vet_errors
...
Fix vet errors
Upstream-commit: 3118ccc6bcd2a2d63700584dc1ce2dbb0a65cbb6
Component: engine
2015-01-14 15:18:20 -08:00
403c558154
Merge pull request #10102 from jfrazelle/windows-fix
...
Add build constraint for windows
Upstream-commit: 73bf350d3d538780b2b3fbeb207369544f36fdd1
Component: engine
2015-01-14 15:15:46 -08:00
8d01a3ebdf
Add build constraint.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 798215af24953f5e3dcacb08965f3714b2fd903f
Component: engine
2015-01-14 14:40:07 -08:00
8b29f19b21
Fix format calls as suggested by vet
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a75b02fe72f3da73f9788919ff2c22f183978db7
Component: engine
2015-01-14 14:12:03 -08:00
6d98dd3144
Fix vet error about passing Mutex by value
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bb96e53b0f947a31a4b66e76607eed0097917ed5
Component: engine
2015-01-14 14:03:00 -08:00
2c43314302
Calming vet about type aliases from other package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5ce60217f1ba07015af72978e715a08259e2efc1
Component: engine
2015-01-14 14:01:36 -08:00
c664f952ef
Merge pull request #10082 from jfrazelle/10081-fix-renaming
...
Renaming a container with an invalid name should fail
Upstream-commit: f67c6d313b971a068262a09840f7afdf4d34b292
Component: engine
2015-01-14 13:12:36 -08:00
