Commit Graph
4049 Commits
Author SHA1 Message Date
Alexander Larsson 65b7bbeca7 archive.ApplyLayer() remove files recursively
Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
Upstream-commit: 484804abffda2692492e295d4691f90564d05eb2
Component: engine
2013-11-07 22:46:44 +01:00
Solomon Hykes 7380c2e120 Merge pull request #2 from tianon/dm-plugin-dockerfile
Hack: Add lvm2 static compilation to Dockerfile
Upstream-commit: 140da580d4f0efaf6c1bc470a16edc7c7f2477c7
Component: engine
2013-11-05 09:35:03 -08:00
Solomon Hykes 4143b61e6c Merge pull request #1 from crosbymichael/register-plugins
Add graph driver registration 
Upstream-commit: 5bad7d72291a5d37fe328b2d8742bfe1ff1f94f7
Component: engine
2013-11-04 15:25:57 -08:00
Michael Crosby 14efe59bac Add graph driver registration
Upstream-commit: 752bfba2c5d6030d6fe3d615d0c2afd2696e7b20
Component: engine
2013-11-04 15:22:34 -08:00
Tianon Gravi 2e3d85e90f Add libdevmapper static compilation to Dockerfile for device-mapper
Upstream-commit: d11f75b5050944e373125008be1c9683797c72a9
Component: engine
2013-11-04 16:11:33 -07:00
Tianon Gravi 57c35f0f44 Update Dockerfile to consistently use tabs as the command argument separator
Upstream-commit: 24dd838aeefcf4ea1f5a950a9fe0af075f00e2bf
Component: engine
2013-11-04 15:39:16 -07:00
Solomon Hykes 4092fc1017 Integrate devmapper and aufs into the common "graphdriver" framework.
aufs is still enabled by default, no mechanism for switching drivers
yet.
Upstream-commit: 98c3693acf2db18c0d0c6211498bf6e1d8f068c6
Component: engine
2013-11-04 17:28:35 +00:00
Solomon Hykes 582c8c2bcd devmapper: rename plugin*.go to driver*.go
Upstream-commit: 6c77f2c1894e906a28a64a4991b4fc2c89cd9ad6
Component: engine
2013-11-04 17:23:46 +00:00
Solomon Hykes 2347b141fc devmapper: renamed DMBackend to Driver
Upstream-commit: b77c5c59840a731c721bbce37765cd475c2cee23
Component: engine
2013-11-04 17:22:43 +00:00
Michael Crosby 5e088dc278 Merge pull request #2541 from shykes/graph-backend-rename
Rename graph backends to 'drivers' which is probably more self-explanatory
Upstream-commit: 3cd4232e52441600dad71117f0612bf9cc5cc028
Component: engine
2013-11-04 08:22:07 -08:00
Solomon Hykes a4e732c90b Rename graph backends to 'drivers' which is probably more self-explanatory
Upstream-commit: ff42748bc567745198b33baa697338dd697fb621
Component: engine
2013-11-04 01:54:51 +00:00
Solomon Hykes 35f9c13fe5 devmapper: implement OnRemove
Upstream-commit: d23b9e87344bd7c153e05abdd05cc28840814a22
Component: engine
2013-11-02 21:25:06 +00:00
Solomon Hykes b69b588093 devmapper: rename Create() to OnCreate(), cleanup tests
Upstream-commit: d2c2c2c1162498e6f7c2b9298795e3ef77b6523b
Component: engine
2013-11-01 19:30:30 +00:00
Solomon Hykes 9c7bb08099 Work In Progress: fix devmapper plugin, first independent test passes.
Upstream-commit: d64df7c7659560d520a7d8ad8987083e4d52cefc
Component: engine
2013-11-01 19:04:08 +00:00
Solomon Hykes b76d80893d Work In Progress: devmapper backend plugin
Upstream-commit: 86dd2473c1351df87520111b1b1ba9953f9e5f09
Component: engine
2013-11-01 05:06:49 +00:00
Solomon Hykes 6fb0ff4f9a archive.ApplyLayer(): parse a tar archive as a standard aufs-compatible diff, and apply it on a directory
Upstream-commit: 318dd33fb778282c3012ee06d892d6375e98cd6b
Component: engine
2013-11-01 05:06:35 +00:00
Solomon Hykes 2e8d2b4ea3 Re-incorporate ChangesDirs() for the use of the devmapper backend,
without changing existing prototypes.

This is a neutral change. The primary aufs backend is still in place
and not affected.
Upstream-commit: a5031d47d9ca283c1fd9db1e94cd19f9b9a73af9
Component: engine
2013-11-01 04:52:39 +00:00
Solomon Hykes c2b31012f8 Partial merge of devmapper/ in order to integrate it as a backend
plugin.

The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
Upstream-commit: 36c7a7ae943220ffb1bea9cd47d2f586db00eab2
Component: engine
2013-11-01 04:24:17 +00:00
Solomon Hykes a909cf84d6 Merge pull request #2498 from dotcloud/move-archive
Move archive.go to sub package
Upstream-commit: 4dc156252b952d2577834029fafce97d3db1c5f7
Component: engine
2013-10-31 20:33:53 -07:00
Michael Crosby f514bb46a5 Initial work on moving aufs to a subpackage
Upstream-commit: 699a1074fb9cdf323044f8c132d7130f6a2945bc
Component: engine
2013-10-31 18:07:54 -07:00
Michael Crosby fb9771da9e Move archive.go to sub package
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
Victor Vieux 04226c60be Merge pull request #2494 from shykes/engine-links
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
2013-10-31 16:32:49 -07:00
Tianon Gravi 4727eb9c29 Merge pull request #2496 from philips/patch-1
Update systemd service file with a better description
Upstream-commit: 3e7b9763aaffb87a82cbb4caacf3f681e0795ae4
Component: engine
2013-10-31 14:55:30 -07:00
Brandon Philips 9053b11b66 fix(systemd): provide a better description
Fix-up the docker service file description to declare what the service is not what it does.

When a systemd machine starts up the Description of each unit scrolls by instead of the service's filename. Because the current description doesn't say what it is it isn't very friendly:

```
Oct 31 20:40:49 localhost systemd[1]: Started Update Engine.
Oct 31 20:40:49 localhost systemd[1]: Starting Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Reached target Multi-User System.
Oct 31 20:40:49 localhost systemd[1]: Starting Easily create lightweight, portable, self-sufficient containers from any application!...
Oct 31 20:40:49 localhost systemd[1]: Started Easily create lightweight, portable, self-sufficient containers from any application!.
```
Upstream-commit: 393562340c6f386a837eac9a616c456dc54faa4f
Component: engine
2013-10-31 14:41:49 -07:00
Andy Rothfusz fefd04077b Merge pull request #2482 from elee/patch-1
correct assignment of $PORT from docker port output
Upstream-commit: d5891f9fb08d8366dc213465e105ed2e3036b264
Component: engine
2013-10-31 12:18:24 -07:00
Andy Rothfusz f1d3f730e4 Merge pull request #2475 from dudebout/patch-2
Fixes the password value in the redis/links example
Upstream-commit: 09607bb8f68e6fe45c90514c6acd13d0a6e7087b
Component: engine
2013-10-31 12:17:43 -07:00
Andy Rothfusz f28b4da1c3 Merge pull request #2477 from dudebout/patch-3
Fixes typo in the CLI documentation
Upstream-commit: 35044efce55bb07b7309f10129c91bcc14cb513a
Component: engine
2013-10-31 12:17:06 -07:00
Andy Rothfusz 76a46c89b0 Merge pull request #2462 from tlunter/fix_remote_api_doc
Fix formatting on build-an-image-from-dockerfile-via-stdin
Upstream-commit: 54024ddd8a38881be173eb3124c4019e4ce381ea
Component: engine
2013-10-31 10:56:38 -07:00
Michael Crosby ce0d02b06f Merge pull request #2305 from mzdaniel/1800-testing-dind
Testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker
Upstream-commit: e37a7d49818581a17303aacd06baf1db6835cfd6
Component: engine
2013-10-31 09:42:19 -07:00
Nicolas Dudebout 73541bce08 Fixes another instant of the password
Upstream-commit: 7e7c931d2b6d667ed97957df37e26b49888933c1
Component: engine
2013-10-31 08:55:14 -04:00
Todd Lunter bf5d4694b4 Fixed the quoted text
Upstream-commit: 3a14d4c923109b93ba805e661fa1573c3b2f9db7
Component: engine
2013-10-31 08:46:16 -04:00
Victor Vieux 0220a89b0a Merge pull request #2481 from tmc/patch-1
Fix typo in redis doc
Upstream-commit: 15457febbbb2c3ea6feee087851449b3717279eb
Component: engine
2013-10-31 01:24:04 -07:00
Eric Lee 02e12e8500 correct assignment of $PORT from docker port output
in the example, PORT is assigned to "0.0.0.0:<port>" vs "<port>" as in previous versions of docker (I encountered this documentation discrepancy tonight after installing docker v0.6.5)
Upstream-commit: df1621914b56b4ed20f684363247a9bb0c7acebf
Component: engine
2013-10-31 01:08:16 -04:00
Travis Cline 17e208649c Fix typo
Upstream-commit: f77bbfca56e45b4cb405ecb5f2c950c294375b59
Component: engine
2013-10-31 00:07:58 -05:00
Nicolas Dudebout 3c41e18387 Fixes typo in the CLI documentation
Upstream-commit: 87a250b71186547312dc7b5f6960aae485a465cd
Component: engine
2013-10-30 23:09:02 -04:00
Nicolas Dudebout 5dfb155fe5 Fixes the password value in the redis/links example
Upstream-commit: ccc1a5dcfb78de8718df08db9e09ea17d9723a16
Component: engine
2013-10-30 22:52:47 -04:00
Victor Vieux 2ea7830596 add 0.6.5
Upstream-commit: ca2bbe716c22d90410d388a710642f76f06826df
Component: engine
2013-10-30 19:30:32 -07:00
Oguz Bilgic 3ef06332af Reformat CHANGELOG.md
* Add line after headers
* Remove space before bullet points
* Fix ' character
* Create sub-headers
* Group add fix etc. Upper-case
* Use head to trac current progress
Upstream-commit: 13ab83a8a5d5ebd97dc8490355c0b9064d8fe57c
Component: engine
2013-10-30 19:30:32 -07:00
Victor Vieux 7302345b08 Merge pull request #2473 from dotcloud/remove-panic-from-name
Assign id as name when all else fails
Upstream-commit: 429c3108daee9a9448ac7fa401fd1ad7525c3722
Component: engine
2013-10-30 19:22:57 -07:00
Victor Vieux e034785968 Merge pull request #1536 from griff/envfile
Runtime: Keep env variables out of the command line
Upstream-commit: bdbb0371a76864eecd4c3059957417c4b582eba2
Component: engine
2013-10-30 19:20:29 -07:00
Victor Vieux 1e48612a2b Merge pull request #2470 from metalivedev/2369-docuncompress
Documenting decompression behavior.
Upstream-commit: c1c65f972a0db81be9415c330493e7d76d3a6501
Component: engine
2013-10-30 19:14:51 -07:00
Victor Vieux a162db7be1 Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
2013-10-30 18:57:07 -07:00
Victor Vieux 68c3dce6e6 Merge pull request #2299 from tmc/master
Client: Add -notrunc and -q flags to docker history
RemoteAPI: Add size to history
Upstream-commit: 4dfa28fb95edbd92fc93005040a51fbf923720c2
Component: engine
2013-10-30 18:52:18 -07:00
Michael Crosby 4eb97d1f45 Assign id as name when all else fails
Upstream-commit: 8227ea35cfc6a8e7e3da7baed5bfa8a62e304df5
Component: engine
2013-10-30 18:31:18 -07:00
Travis Cline 67b88fd430 Add flags to history, add size flag
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
Brian Olsen 67465c23f0 Fixed problem with variables containing \n.
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
2013-10-31 01:19:32 +01:00
Brian Olsen fe428bd3cd Support copying value from env with -e option.
Upstream-commit: 25c4c87c86aca2f17363dbcd9d7bc47640ff9c23
Component: engine
2013-10-31 01:19:09 +01:00
Andy Rothfusz ddf4ad8def Fix #2369 by documenting decompression behavior.
Upstream-commit: 26f4d6bf59bee7cd4290ea4e31a19da087a180f2
Component: engine
2013-10-30 16:50:58 -07:00
Brian Olsen 303967e843 Set environment variables using a file.
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
2013-10-31 00:48:12 +01:00
Michael Crosby 75ba650555 Merge pull request #2456 from dotcloud/update_release_checklist.md
Update RELEASE-CHECKLIST.md to reflect new changes
Upstream-commit: 5eb472025ad37539e86305cec9b139f77ce8dff8
Component: engine
2013-10-30 16:38:09 -07:00