Commit Graph

40 Commits

Author SHA1 Message Date
a3eaed6ca5 Fix misuses of format based logging functions
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: 6705477673be7c303369778f6f288ee600ce3893
Component: engine
2014-11-19 23:59:02 +02:00
658637c073 Merge pull request #8964 from jlhawn/image_checksum
Compute TarSum on storage of image layer content
Upstream-commit: 039aa2741fa95ecb21e35a20d60d72018d8296c9
Component: engine
2014-11-13 18:07:20 -08:00
81751423a5 Don't loose precision when parsing image size on 32 bit machines. Presumably fixes #8979.
Signed-off-by: Recursive Madman <recursive.madman@gmx.de>
Upstream-commit: 5cd53195fddd9a2843ad57c6e1ac11bec1ac37f0
Component: engine
2014-11-11 09:24:45 +01:00
5426d99b67 Compute TarSum on storage of image layer content
Now, newly created/imported layers will have the checksum of
the layer diff computed and stored in the image json file.

For now, it is not an error if the computed checksum does not
match an existing checksum, only a warning message is logged. The
eventual goal is to use the checksums in the image JSON to verify
the integrity of the layer contents when doing `docker load` or
`docker pull`, and error out if it does not match.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 059e589c3427b1afa1b112acc931f59b5b063e16
Component: engine
2014-11-05 10:17:55 -08:00
617b00b175 image: stream img JSON & Decode in LoadImage
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4dbbe4f51a22a9ec335fbf2f6e3981132f868312
Component: engine
2014-11-04 16:15:00 +02:00
ade837e2a4 Remove jsonData argument from image.StoreImage
The argument specified the json data to save to disk when registering
a new image into the image graph. If it is nil, then the given image
is serialized to json and that is written by default. This default
behavior is sufficient if the given image was originally deserialzed
from this jsonData to begin with which has always been the case.

Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 26184de8ab1dfe812094c55c9becd8ebb60ed7be
Component: engine
2014-11-03 17:39:21 -08:00
bad39206ea Mass gofmt
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ee7dd44c017458c8fe0be8e09569b1238366dca3
Component: engine
2014-10-24 15:11:48 -07:00
2d56e3cbc6 Use logrus everywhere for logging
Fixed #8761

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 7c62cee51edc91634046b4faa6c6f1841cd53ec1
Component: engine
2014-10-24 15:03:06 -07:00
afe8e130e0 Move archive package into pkg/archive
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
Upstream-commit: 30d5a42c1f24e26f681b7330249f04fec891aee9
Component: engine
2014-09-29 23:23:36 -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
e9ab736d16 move some io related utils to pkg/ioutils
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 76212635b594d4472dd8d5b2e071fac416addbe7
Component: engine
2014-09-03 11:36:21 +03:00
ef058f588f Cleanup: move image depth checks in image/
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 2a39635d30a5ecbf3f8020dcb272cd8ae939fe06
Component: engine
2014-08-15 00:43:12 +00:00
4737f7cea5 Extract log utils into pkg/log
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net> (github: capoferro)
Upstream-commit: a02f67be5b17da63d475e6f35956c1e72c3b2e7b
Component: engine
2014-08-13 15:18:15 -07:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
dcfc8d37e9 docker save: raw json
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: d3bc787bca62edff384e06a12224be2d982353da
Component: engine
2014-06-20 14:38:17 -04:00
2acb87c29f Initial work on selinux patch
This has every container using the docker daemon's pid for the processes
label so it does not work correctly.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f0e6e135a8d733af173bf0b8732c704c9ec716d7
Component: engine
2014-04-29 03:40:05 -07:00
f7be50364d Rename runtime/* to daemon/*
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
2014-04-17 14:43:01 -07:00
8d099b8012 Gofmt imports
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
2014-03-17 11:41:28 -07:00
742b723fc2 Move graphdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
2014-03-17 11:40:12 -07:00
fc0f37e6e1 Move image into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82a5439835b0bff3ab3dfb169415948dae504d56
Component: engine
2014-03-09 22:59:29 -07:00
f38c26d351 Removed deprecated docker/image module
Upstream-commit: 0f952a7dbb53c3c0f39d4762a340e12a30ac86de
Component: engine
2013-03-13 15:36:22 -07:00
7c2c4d6c33 Merged upstream changes in fs branch
Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2
Component: engine
2013-03-11 05:50:09 -07:00
347532ed43 Merged master branch into fs
Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364
Component: engine
2013-03-11 05:42:36 -07:00
fae9969603 Removed deprecated docker/image package
Upstream-commit: dd0227b700503e03fce0e9e9ea3539c438e9c0cb
Component: engine
2013-03-09 20:17:31 -08:00
279f7946e3 gofmt
Upstream-commit: c59fff422fdc61c1c994b44fd83e4173a2f0530a
Component: engine
2013-03-09 19:44:09 -08:00
9e8c334ba7 Remove leftover debug message
Upstream-commit: 791592731eccfae0072b20a80d15ec31e34dc88f
Component: engine
2013-03-06 00:37:00 -08:00
c114400a94 docker rmi -r: remove all images matching a regexp
Upstream-commit: 74c88fdbc0180c276f75322066e7da2e3cd38f6d
Component: engine
2013-03-05 22:39:43 -08:00
9a491da582 Merge branch 'master' into fs
Upstream-commit: ffbb9c8e4a1b7c98bbb602a8428376e4a41214d3
Component: engine
2013-02-26 17:45:55 -08:00
d2bed9b75c go fmt
Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9
Component: engine
2013-02-26 17:26:46 -08:00
471e62f72d Added tests for checksum computation in layer store
Upstream-commit: 6d1054619d6d254ea3df0484cacb3c6778d58cd9
Component: engine
2013-02-26 09:46:29 -08:00
0b5203d2cd 'docker pull' and 'docker put' automatically detect tar compression (gzip, bzip2 or uncompressed). -j and -z flags are no longer required.
Upstream-commit: f437f5b8b4a706d56f9a7cfba1dbc6b21e9a33f3
Component: engine
2013-02-22 12:28:25 -08:00
331c7cd0d3 dockerd: create /var/lib/docker if it doesn't exist
Upstream-commit: 5e2f0639c64dc8a7ee5da81e0801bc4a17787407
Component: engine
2013-02-19 13:03:58 -08:00
7adde75277 docker/fs: initial support for filesystem layers (adapted from image/layers.go)
Upstream-commit: 6372a1a0d0b6506f25db7ba3dbba1e65fd6deb2d
Component: engine
2013-02-18 15:25:43 -08:00
026bf169c9 Upload or download gzipped and bzipped images with put/pull -j/-b
Upstream-commit: 059837c92a6692feb5a6aad879e01e6380f82dca
Component: engine
2013-02-12 22:23:14 -08:00
d5ca862c98 docker rmi: remove an image
Upstream-commit: de1c361a6eea95c867c43619fc1e7a7b8a147750
Component: engine
2013-02-01 00:08:45 -08:00
f9700d8d8c Fix bug introduced in c7a944caf28d85bd26f4031465e958006a764ac2 which caused 'docker images' to crash
Upstream-commit: f8f9285ccaeb35a2d5909a03f48f9d3b9d34aca2
Component: engine
2013-01-29 12:15:39 -08:00
8805019aeb List containers ordered by creation time
Upstream-commit: c7a944caf28d85bd26f4031465e958006a764ac2
Component: engine
2013-01-29 03:24:31 -08:00
b6d8688923 Fixed a bug which caused 'docker cp' to fail when the destination name already exists.
Upstream-commit: 49da84d7c4babd597dfbcba168a81a4434c28bf1
Component: engine
2013-01-28 23:17:47 -08:00
98216a0181 Fixed bug which caused AUFS layers to be mounted in the wrong order.
Upstream-commit: 2dadcf9b81f27113564260e668d5b734d7a9c63c
Component: engine
2013-01-28 23:15:02 -08:00
0dd4a9f417 Experimenting with a UI which differentiates images and containers
Upstream-commit: 904b0ab52b065025acbdba6fdc056ef1dff04d44
Component: engine
2013-01-27 15:42:42 -08:00