91fbeb48fc
hack/install.sh: install apparmor when enabled
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 9619ce9dd14d31cbf52c53741a1f35842bbe99a6
Component: engine
2014-09-17 12:13:31 +03:00
dc62b54723
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
Upstream-commit: ca39a3e36b8b76539bc30f0f4e2761222c50919f
Component: engine
2014-09-17 03:23:50 +04:00
9cf50f0282
Merge pull request #7989 from jlhawn/graphdriver_differ_refactor
...
Refactor use of graphdriver.Differ
Upstream-commit: 37b3b34afa11b352fb164625f17e76b7d851ee60
Component: engine
2014-09-16 18:58:38 -04:00
d6a77f1cb7
Merge pull request #8068 from jfrazelle/cleanup-various-fix-me-refs
...
Cleanup various fix me refs
Upstream-commit: ffbd8fe5b9a5913c8336045c7b25c848c53f783d
Component: engine
2014-09-17 02:54:54 +04:00
58d6278266
Resolve conflicts with restart policies
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: e49c70109228d657790190007c8f9d7c55a25be2
Component: engine
2014-09-16 18:40:25 -04:00
31081e7819
add 'docker create' man page
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 22eb3a3a50a1fc3762cf4b294c167397591cfd58
Component: engine
2014-09-16 18:40:25 -04:00
4cbe53bc28
Add create to contrib/completion
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 1ec283c3eb37d514be3778537c7ef9d727337f52
Component: engine
2014-09-16 18:40:25 -04:00
f321bfe40f
docs fix
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 7c85cf5f390a8fe5088d2e275abfd2404aa19048
Component: engine
2014-09-16 18:40:24 -04:00
b187bcdd06
integration-cli: Add docker create tests
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b0cb37fd3bd65b27a63954b36507a9782088cfc4
Component: engine
2014-09-16 18:40:24 -04:00
764b128304
Add "docker create" support
...
This exposes the already existing "create container" operation. It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Conflicts:
api/client/commands.go
runconfig/parse.go
server/container.go
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 3a90004f3c2d86ec849f4674c8046693ea061ed1
Component: engine
2014-09-16 18:40:24 -04:00
4b9819fd16
Merge pull request #8074 from unclejack/add_exec_help
...
add exec to the commands list
Upstream-commit: 9c3eedae89cb0db26b4ef1ae0b9c5b8e573e7ef8
Component: engine
2014-09-16 18:17:08 -04:00
9681f2740a
add exec to the commands list
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: fccb02622183ee93036d4f5068817830f3297ab5
Component: engine
2014-09-17 01:13:43 +03:00
a611fd0e01
Merge pull request #8055 from cpuguy83/7792_fix_volume_mount_ordering
...
Fix #7792 - Order mounts
Upstream-commit: ed957232a1bb7d9a836b254316a6c0ae27b90a11
Component: engine
2014-09-17 02:13:35 +04:00
ec0fc2a729
graphdriver interface name change, typo fix
...
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
Upstream-commit: 09ad65ebd5b50fdd7621f42136278102586a7ea8
Component: engine
2014-09-16 15:10:32 -07:00
861f46b221
Refactor use of graphdriver.Differ
...
Some graphdrivers are Differs and type assertions are made
in various places throughout the project. Differ offers some
convenience in generating/applying diffs of filesystem layers
but for most graphdrivers another code path is taken.
This patch brings all of the logic related to filesystem
diffs in one place, and simplifies the implementation of some
common types like Image, Daemon, and Container.
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
Upstream-commit: dee6b481fe0da1d845261ffff2e610fb05898d3c
Component: engine
2014-09-16 15:10:32 -07:00
9c843f0293
Merge pull request #8035 from duglin/Issue7965
...
Add timeout to client - fix for #7965
Upstream-commit: eb21197c6b4981db3cc2ad95694f92d723d34e2f
Component: engine
2014-09-17 01:55:48 +04:00
1f9dd77aaf
Fix #7792 - Order mounts
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0a3211f131b63b0646be4a19c3ea5147bd557844
Component: engine
2014-09-16 14:51:06 -07:00
bcad074599
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
Upstream-commit: 51b26853ef2f124ea837364c02585cbf96999d6a
Component: engine
2014-09-16 13:55:03 -07:00
ad141b9260
Add exec to autocompletions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c9c004d700af23c238adef40a1e579d21c6c5765
Component: engine
2014-09-16 13:01:10 -07:00
d25c9ab27a
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
Upstream-commit: 00fd008170e463426001ec4c56fc4c39450fd8d0
Component: engine
2014-09-16 23:56:12 +04:00
c4f90f34f5
Merge pull request #8063 from jlhawn/tarsum_empty_tar_archive
...
tarsum: correct close and finish reads
Upstream-commit: 0a6fd743ea7b0b312620e8b0f51d576a3f71f07c
Component: engine
2014-09-16 15:41:28 -04:00
8b57e6f159
Adding docker exec support in CLI.
...
Fixed a bug in daemon that resulted in accessing of a closed pipe.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: c786a8ee5e9db8f5f609cf8721bd1e1513fb0043
Component: engine
2014-09-16 19:24:25 +00:00
258946589c
Merge pull request #8054 from estesp/6830-fix-json-strings
...
Proper JSON handling of strings that could be represented as other types
Upstream-commit: f88e2e8b99c4f9a4e58f14f29dc9286931c92f0d
Component: engine
2014-09-16 15:11:25 -04:00
aa9173b397
Merge pull request #8059 from estesp/8057-refactor-regexp-to-package-var
...
Refactor all pre-compiled regexp to package level vars
Upstream-commit: 28f09f06326848f4117baf633ec9fc542108f051
Component: engine
2014-09-16 15:04:23 -04:00
dbf2eb7488
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 1b0b1ec65729a2e018df1334b70b851714995e9e
Component: engine
2014-09-16 13:51:02 -04:00
18829722f0
Return errors in NewDaemonFromDirectory instead of calling Fatal
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 23b2c39a40186ce9b6deb4ae9201d5c20cc75abe
Component: engine
2014-09-16 10:42:59 -07:00
a1bab7db37
DisableNetworkBidge doesn't need to be public anymore
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 67c254a60a77c1f80804be7ab97353530987c846
Component: engine
2014-09-16 10:37:50 -07:00
a36831cc2a
Fix for issue 7902.
...
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd7a5f5c0998f288f71d307076e661ed54f1a5f1
Component: engine
2014-09-16 10:28:37 -07:00
b4607092ee
Refactor all pre-compiled regexp to package level vars
...
Addresses #8057
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 4119c9d7d955757092adc3410da8d75f972bd3c1
Component: engine
2014-09-16 12:57:44 -04:00
f8b8f5b4f2
Merge pull request #8026 from tonistiigi/validate-context-error-handling
...
Improve ValidateContextDirectory error handling.
Upstream-commit: 23bb6513a05fd8968e192a74dd2b654761e18d1e
Component: engine
2014-09-16 12:44:55 -04:00
b6e3f16eca
Correct tarsum finish logic
...
Tarsum now correctly closes the internal TarWriter which appends
a block of 1024 zeros to the end of the returned archive.
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
Upstream-commit: bc956c6b79dbe9cc7a1ab198f92b6843d072eb28
Component: engine
2014-09-16 09:34:21 -07:00
d0a61e9c18
Improve ValidateContextDirectory error handling.
...
- Errors sent to the walker callback functions were ignored. This meant that
one could get a panic when calling methods on a nil FileInfo object. For
example when the file did not exists any more.
- Lstat calls inside walker callback are reduntant because walker already calls
Lstat and passes the result to the callback.
- Error returned from filepath.Rel() can never be EACCES because it compares
strings and does not care about actual files.
- If Matched() returns error then ValidateContextDirectory() must return error.
Currently it still kept walking although the outcome was already known.
- Function will now fail in case of unknown error(not EACCES nor ENOENT).
Previous implementation did not make a clear decision about this (but
panicked because of the issues above).
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: a8914293fbb1328f9a5c931bd51e34f5d6584e17
Component: engine
2014-09-16 19:17:34 +03:00
0eea93fc0c
Merge pull request #5977 from vbatts/vbatts-tarsum_xattrs
...
tarsum: include xattr headers in to the checksum
Upstream-commit: 4da86f88a045a08e0e1aaf6025c7a0ce9da60c31
Component: engine
2014-09-16 18:07:03 +03:00
abfdc34927
Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
...
Consistently use 'sudo docker' in examples
Upstream-commit: b64558907139911b86d846de70ab859504cc45a2
Component: engine
2014-09-16 08:43:58 -04:00
dade82e420
Merge pull request #8060 from SvenDowideit/missing-t-in-get-api-eg
...
Added missing 't' from the end of the /images/{{id}}/get eg.
Upstream-commit: b040ba99d09ec18a3dc7f8d9955ae63d6ede7170
Component: engine
2014-09-16 08:43:26 -04:00
0fd379bbda
Added missing 't' from the end of the /images/{{id}}/get eg.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 4352ea7b0a746f00c29fb1170e893242cb8612ef
Component: engine
2014-09-16 15:27:44 +10:00
7a508b61c2
Merge pull request #8013 from unclejack/fix_testimportdisplay
...
integ-cli: fix TestImportDisplay & add FileServer
Upstream-commit: 0954fb32a4a39735a5fc6e402b1659ee3ba0d1cb
Component: engine
2014-09-15 22:36:51 -06:00
cd4d60a084
Consistently use 'sudo docker' in examples
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
a7a415757f
Merge pull request #8034 from michaljemala/patch-1
...
The default name of the bridge created is called 'docker0'.
Upstream-commit: 023241614efbbf143041f261df969bed6fc7f645
Component: engine
2014-09-15 17:32:57 -07:00
fa164d03f1
Add a timeout when trying to connect to the server, otherwise sometimes it just hangs
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f013aa7f96d7fc818f06f5b7fe0bbd20ff2d3294
Component: engine
2014-09-15 17:30:38 -07:00
9a9cc402da
Help new users if their SELinux is not-upgraded yet.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a3f51da98adf27d1f312edac04f0f9863019a8e8
Component: engine
2014-09-16 10:18:50 +10:00
1e452211b4
Merge pull request #8036 from unclejack/kernel_version_requirement
...
docs: change kernel version requirement
Upstream-commit: 2f65ed0968a5a3630872b4e94ed0f347945b4a8f
Component: engine
2014-09-16 10:14:02 +10:00
1bc2448cc5
Merge pull request #8037 from unclejack/shrink_docs_images
...
docs: shrink images
Upstream-commit: 62b86613e8c6bb8fa1c50fd30a92c050ffbed88e
Component: engine
2014-09-16 10:13:03 +10:00
6689bc7ede
Adding state to exec commands to prevent multiple starts of a single exec command.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 39030382c4809029cc3897e59f97948b00d57ad1
Component: engine
2014-09-15 23:14:04 +00:00
ca62c3b92b
Splitting the exec remote API into two separate APIs inorder to support resizing of tty sessions.
...
1. /container/<name>/exec - Creates a new exec command instance in the daemon and container '<name>'. Returns an unique ID for each exec command.
2. /exec/<name>/start - Starts an existing exec command instance. Removes the exec command from the daemon once it completes.
Adding /exec/<name>/resize to resize tty session of an exec command.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: bfebdfde78753f85d53d62634654de0b80f6872d
Component: engine
2014-09-15 22:56:47 +00:00
86091bac44
integ-cli: fix TestImportDisplay & add FileServer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 9e5592d6a10ce02fb77244c7de3fff38958e0b89
Component: engine
2014-09-16 01:54:21 +03:00
c472fc422b
Update integration-cli tests to allow one-letter tag as valid.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 985fae256f3fcaea5cf67581ae3d83a46bc52d9e
Component: engine
2014-09-15 15:17:50 -07:00
1849466b73
Merge pull request #8049 from unclejack/fix_tag_validation
...
graph: validate tags properly & add unit tests
Upstream-commit: 09982d0f975cfc302fb12f22905673546ef40cd7
Component: engine
2014-09-15 14:32:02 -07:00
fc234a85d7
graph: validate tags properly & add unit tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: ada883b198aa5e7a42d344174dcec04933c6fb2a
Component: engine
2014-09-16 00:13:54 +03:00
bd606a30d9
Merge pull request #8023 from nerab/patch-1
...
Append instead of replace file contents
Upstream-commit: 4b0bb716270bab57714c54ac12f295345263fc54
Component: engine
2014-09-15 13:54:41 -07:00
