Commit Graph

94 Commits

Author SHA1 Message Date
18b9488ee1 Save layersize on pull
Do not display size and virtual size on the cli.
Only display virtual size on the cli
Upstream-commit: 697707e4afe6f1e7e5e33c24ada2f1f2af279142
Component: engine
2013-12-05 14:03:23 -08:00
ee50ddf929 split in 3 files
Upstream-commit: 597e0e69b4c8521f39691d0a07d1f31b7116a337
Component: engine
2013-11-28 12:16:57 -08:00
caee8ff1ca Fix a race condition in TestInterruptedRegister
Upstream-commit: 02cb7f45fa6f9a8899286431fa68bf1a9d0194d8
Component: engine
2013-11-26 05:05:15 +00:00
21e81bd668 Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked.
Upstream-commit: fb3d60f27adba32ab60022298702a4376c1f4d0d
Component: engine
2013-11-26 05:05:15 +00:00
020e2aed63 Merge branch 'master' into use_utc_time
Conflicts:
	image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
2013-11-25 19:01:13 -08:00
eec0335af0 Use UTC for time
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
2013-11-21 16:43:36 -08:00
6fbdd28642 Ensure that only the layers are compressed and not mnt points
Upstream-commit: 4e0c76b321cf42d36cdbedcf84103f4fcc123ecd
Component: engine
2013-11-20 15:37:26 -08:00
f6524ff456 Handle image metadata when drivers are switched
Upstream-commit: 1b28cdc7f977f265d0d8de53e8ec1d773ed54db1
Component: engine
2013-11-20 10:31:51 -08:00
b6950e3878 Merge branch 'master' into creack-merge-master
Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
2013-11-19 14:58:12 -08:00
6e0c243c2e Lintify code with confidence=1
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
2013-11-18 16:24:11 -08:00
ea7ee7989a Unlink docker init files
Upstream-commit: 29fa1b6666f28e7f42e92a10d195823fa84b7622
Component: engine
2013-11-14 21:23:23 -08:00
084cb15f1a Allow drivers to implement ApplyDiff in Differ interface
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
2013-11-11 19:09:57 -08:00
7c76e102e9 Don't use drivers to store temporary image downloads
Upstream-commit: 948bb29d27dc7e367cd27003c059d83301b15c4f
Component: engine
2013-11-09 00:53:58 +00:00
783f801512 gofmt
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
2013-11-07 23:58:03 +00:00
7e3e167f73 Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
2013-11-07 22:38:50 +00:00
14efe59bac Add graph driver registration
Upstream-commit: 752bfba2c5d6030d6fe3d615d0c2afd2696e7b20
Component: engine
2013-11-04 15:22:34 -08:00
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
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
f514bb46a5 Initial work on moving aufs to a subpackage
Upstream-commit: 699a1074fb9cdf323044f8c132d7130f6a2945bc
Component: engine
2013-10-31 18:07:54 -07:00
fb9771da9e Move archive.go to sub package
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
303967e843 Set environment variables using a file.
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
2013-10-31 00:48:12 +01:00
0d8ea16762 Merge pull request #1759 from bdon/graph-map
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
Upstream-commit: ad152efbed6ddb74a352c39147bae9b0e8c87435
Component: engine
2013-09-10 08:49:11 -07:00
23416421ac fix init layer
Upstream-commit: 446ca4b57b228a2d030f0c816e08948ff7da1d79
Component: engine
2013-09-09 20:29:57 +00:00
5e9efb8def Don't export Graph.walkAll.
Upstream-commit: 113bb396cdef5e07a19306dea767870b2775214d
Component: engine
2013-08-31 20:44:49 -07:00
c7e2ec175d Replace Graph.All with Graph.Map
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
2013-08-31 20:44:42 -07:00
c53567b672 Fix Graph ByParent() to generate list of child images per parent image.
Upstream-commit: 025c759e443cc4eb43fc20b1f7da5520956b3b30
Component: engine
2013-08-11 00:37:16 -07:00
02b34c43f3 Make sure all needed mountpoint are present
Upstream-commit: 18fc707fdf06aeb50fa5250f59f0ef4597d7cf73
Component: engine
2013-08-08 11:25:02 -07:00
82d1681ff0 fix small \n error un docker build
Upstream-commit: ba17f4a06a75a66e11b6cf2ca2cdb5bee4f7bfa8
Component: engine
2013-08-06 14:31:51 +00:00
00a7cbd80b Merge pull request #1290 from dotcloud/parallel_pull
* Runtime: Parallel pull
Upstream-commit: e54e8fa9205409e741a64c7d7746e2e548c52fc0
Component: engine
2013-08-05 14:17:29 -07:00
0c11df3e01 Merge pull request #1267 from sridatta/new-clean-init
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
2013-08-05 13:23:22 -07:00
60591c4d11 rebase master
Upstream-commit: 6166380d76ad49b0a077569466b29b5352df9105
Component: engine
2013-07-30 16:51:50 +00:00
c364da0b51 Remove unused parameter
Upstream-commit: 0f134b4bf81a4d0160932852854b190b7ee7e3b9
Component: engine
2013-07-29 11:30:17 -07:00
78c57a64f0 Refactor the image size storage
Upstream-commit: 0badda9f1587c11a13dca17c68b30addd757237c
Component: engine
2013-07-29 11:30:17 -07:00
e9895c9839 Refactor checksum
Upstream-commit: 8ca7b0646e6c4346075656f46847f53c2e868a3d
Component: engine
2013-07-29 11:30:17 -07:00
a761fb8db0 improve client output
Upstream-commit: 8742649aa7f3524bbfa99b68c8d87ffc5aba0af9
Component: engine
2013-07-24 17:10:59 +00:00
53749f98ce Add ID to JSONMessage in pull
Use goroutines to pull in parallel
If multiple images pulled at the same time, each progress is displayed on a new line
Upstream-commit: 0e71e368a8a781f593b25fdd1318d3882e6d28e5
Component: engine
2013-07-24 15:41:34 +00:00
a6dc7d327c change permissions of initLayer to be readable by non-root users
Upstream-commit: 945033f1ccbc4896e1a784d00f1f2b465ed9e04b
Component: engine
2013-07-22 14:55:07 -07:00
7c7e6abf06 + Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container.
Upstream-commit: 5d8efc107d2c7b7da61a6d22657190c6f13713d2
Component: engine
2013-07-17 17:13:34 -07:00
80e25aa274 fix typo
Upstream-commit: 05d7f85af9e5813ddb1c066e44c802dc33790547
Component: engine
2013-07-09 10:55:28 +00:00
553b7563ec Pushing an Image causes the docker client to give an error message instead of
writing out streamed status.

This is caused by a Buffering message that is not in the correct json format:

[...]
{"status"
:"Pushing 6bba11a28f1ca247de9a47071355ce5923a45b8fea3182389f992f4
24b93edae"}Buffering to disk 244/? (n/a)..
{"status":"Pushing",[...]

The "Buffering to disk" message is originated in
srv.runtime.graph.TempLayerArchive

I am now using the StreamFormatter provided by the context from which the
method is called.
Upstream-commit: 1e2ef274cdaa76e79435df52cdc196739ba8b3b1
Component: engine
2013-07-04 10:50:37 +02:00
e593de79dc following the 'go vet' suggestions.
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
fafb25034a bump to master again
Upstream-commit: bf63cb904592e1ca73aa3990c08ea0b752fec14d
Component: engine
2013-06-05 16:01:36 +00:00
4747c5b99f linted names
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
5fd52ed23e Merge pull request #707 from unclejack/411-add-arch-field
411 add architecture field
Upstream-commit: a373c770b63982674e24704789f80e0ce15bb55d
Component: engine
2013-05-31 17:26:11 -07:00
a42c91a1f7 bump to master
Upstream-commit: 3afdd82e426c70c919d902eec5ec50d488c837fa
Component: engine
2013-05-30 23:38:40 +00:00
037b9b6160 fix json encoding, and use less casts
Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014
Component: engine
2013-05-26 23:45:45 +00:00
04ca200a24 imporved error, push, import insert
Upstream-commit: c8c7094b2e8088210e2182e582264e09222c6e3d
Component: engine
2013-05-25 15:09:46 +00:00
03c163a915 set architecture to x86_64 by default
We're going to hardcode architecture to amd64 for now.
This is a stub and will have to be changed to set the actual arch.
Upstream-commit: 5f69a53dba4b0e550ab29c7f2bf4277222927097
Component: engine
2013-05-25 13:03:49 +03:00
10117596bb first version of Pull
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
317a026976 fix: Can't lookup root of unregistered image
Upstream-commit: 1c946ef0038a27d134f497ed72352136c0a4bb9e
Component: engine
2013-05-24 13:03:09 +00:00