Commit Graph

11895 Commits

Author SHA1 Message Date
482d9b0df3 Be consistent about libtrust import path.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7c7026bd2255cef47cbb026afe0b984d4c9a9130
Component: engine
2014-12-03 17:36:14 -08:00
7930a900f5 Merge pull request #9486 from ClusterHQ/9484-fromSrc-api-docs
Document fromSrc more clearly
Upstream-commit: e15ffa45a670041ceee06c3b51dff177b5f3378f
Component: engine
2014-12-03 20:31:44 -05:00
65e3ca93a1 Merge pull request #9451 from erikh/fix-sqlite
graphdb: initialize the database semi-idempotently on every connection, not just new installs.
Upstream-commit: 8520fd55b66b44f669f6ad6886c7c46d066bd6ca
Component: engine
2014-12-03 17:17:20 -08:00
56a5536647 Merge pull request #9490 from jfrazelle/fix-test-cmd-eff
Fix tests with old cmd function.
Upstream-commit: e2a4b730ca6cc339122d013f33fedd593d95d1f3
Component: engine
2014-12-03 16:29:31 -08:00
b108f27ddc Fix tests with old cmd function.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e201d5bcd46a3dcb70dd6b6e23ee375e4b5b5f40
Component: engine
2014-12-03 15:53:19 -08:00
e1ce0e0de9 Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create
Initialize volumes when container is created
Upstream-commit: 67fda331973fdd23f3da79588ea899dc577f46e8
Component: engine
2014-12-03 15:42:09 -08:00
3d5681303b Update the most recent released version of the docs as well.
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Upstream-commit: 0888c1880f836703987313049100bad9ce821584
Component: engine
2014-12-03 17:14:08 -05:00
d3f88b9d6d Talk about URL support and the real meaning of - in the latest fromSrc API documentation.
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Upstream-commit: 826f809d0959d59d4f478615be4dc9b7db7c46f1
Component: engine
2014-12-03 17:13:48 -05:00
cdaba1e671 Merge pull request #9482 from ncdc/TempArchive-close-bug
Fix invalid argument error on push
Upstream-commit: c8ccfcb93048e24dbe08b2c449dd1ad802f730f4
Component: engine
2014-12-03 14:13:15 -08:00
717d7acf81 Fix invalid argument error on push
With 32ba6ab from #9261, TempArchive now closes the underlying file and
cleans it up as soon as the file's contents have been read. When pushing
an image, PushImageLayerRegistry attempts to call Close() on the layer,
which is a TempArchive that has already been closed. In this situation,
Close() returns an "invalid argument" error.

Add a Close method to TempArchive that does a no-op if the underlying
file has already been closed.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: 48ec176cd51da20e23564941da2d9906a7779d28
Component: engine
2014-12-03 16:12:24 -05:00
576cfafbf2 Merge pull request #9426 from lhuard1A/overlay_rename
Rename overlayfs to overlay
Upstream-commit: 5d49d2bb7a3bafcd1481a05d56ebc39ecd394393
Component: engine
2014-12-03 10:57:42 -08:00
d0fa330b7f Remove the last references to overlayfs
This only renames docker internal structures.
It has no impact on the end-user.

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: 2352f00e4ff2cd102a4d591d67aba8e1c7eaa7b6
Component: engine
2014-12-03 14:06:19 +01:00
34e4a16b13 Rename the overlay storage driver
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
2014-12-03 13:57:23 +01:00
a62f6a9d69 Merge pull request #9429 from sindhus/patch-1
Fix dead link in oracle.md
Upstream-commit: 70c4b4ededd5bfe2f67c7a0c687c80bd45fa2fba
Component: engine
2014-12-03 12:38:17 +10:00
2de1f2dd9b Merge pull request #9430 from sindhus/patch-3
Fix dead link cli.md
Upstream-commit: 315520b8453d4d0d8cf6e3651a06804dc47a8736
Component: engine
2014-12-02 16:06:48 -08:00
d8a6cab65d Merge pull request #9463 from jlhawn/tarsum_test_fix
Fix TarSum iteration test
Upstream-commit: bc7ef42716ba8574845b1f172a363930831ab9e0
Component: engine
2014-12-02 15:55:07 -08:00
efbc3f4d55 Fix TarSum iteration test
I noticed that 3 of the tarsum test cases had expected a tarsum with
a sha256 hash of
  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
As I've been working with sha256 quite a bit lately, it struck me that
this is the initial digest value for sha256, which means that no data
was processed. However, these tests *do* process data. It turns out that
there was a bug in the test handling code which did not wait for tarsum
to end completely. This patch corrects these test cases.

I'm unaware of anywhere else in the code base where this would be an issue,
though we definitily need to look out in the future to ensure we are
completing tarsum reads (waiting for EOF).

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 8d9e25dbddc189f4094e0f25a90f2b8a25deec9d
Component: engine
2014-12-02 15:28:13 -08:00
c7729a9005 Merge pull request #9460 from shin-/docs_webhooks2
Webhooks documentation: additional improvements
Upstream-commit: 1e81a69618ea0c393ae80e52fcc0f446d462bd3e
Component: engine
2014-12-02 17:42:26 -05:00
d3e367d06e Merge pull request #9273 from programmerq/dockerimages_hub
refer to the registry instead of the hub
Upstream-commit: 6a98ce2fc0f26730b9aa07a589806939d42c41f5
Component: engine
2014-12-02 17:15:04 -05:00
9cfd075a8d Webhooks documentation: second pass addressing @fredlf's comments
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: bcef3535579b2e9a8f672626dd014b77ed44c5c0
Component: engine
2014-12-02 13:49:17 -08:00
dd2a47a55c Merge pull request #9457 from icecrime/engine_logf
Remove unused Engine.Logf method
Upstream-commit: 906c7211e6965a29b538e93af3ade981000dff98
Component: engine
2014-12-02 12:17:11 -08:00
dabbee5901 Remove unused Engine.Logf
The `Engine.Logf` method was unused and confusing.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 59da197de8f040eed7560747476f97ce8afad293
Component: engine
2014-12-02 10:47:57 -08:00
fdf7191cae Merge pull request #9435 from cpuguy83/9414_fix_exec_api_error_no_cmd
Check for no `Cmd` on exec create endpoint
Upstream-commit: 50445e4d0c622837f1dd9bd5b3810d3b309b7d18
Component: engine
2014-12-02 10:28:44 -08:00
b775e7f418 Merge pull request #9441 from LK4D4/retry_any_error_on_portmap
Try other port on any error from Map
Upstream-commit: e40bbf3b9a408b3e51e837ca1828237f860011b9
Component: engine
2014-12-02 09:51:50 -08:00
624402f332 Update dockerimages.md
remove 'public registry'

Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 46437d1a60278d1acfe32412f69b3c22749becf2
Component: engine
2014-12-02 10:48:39 -07:00
958b540000 Merge pull request #9442 from icecrime/8658-tls_attach_hangs
Fix client-side HTTP hijacking over TLS
Upstream-commit: 5ec3a038a05116e3b3983d3271ada74408fee0e3
Component: engine
2014-12-02 09:47:29 -08:00
7bc79faafb graphdb: initialize the database semi-idempotently on every connection.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: fb06e1c6ebcf5408e6a7d0bfcf9264571eab69a1
Component: engine
2014-12-02 03:02:25 -08:00
506a27fa45 Rename overlayfs to overlay
Since Linux 3.18-rc6, overlayfs has been renamed overlay.

This change was introduced by the following commit in linux.git:
ef94b1864d1ed5be54376404bb23d22ed0481feb ovl: rename filesystem type to "overlay"

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: c57317893a743720a241ae328d1bdf7bd02b1fea
Component: engine
2014-12-02 10:02:59 +01:00
c0a5d7486b Fix client-side HTTP hijacking over TLS
Properly CloseWrite() the client socket once done with stdin when using
TLS connection (this used to rely on an erroneous type assertion).

Fixes #8658.
Fixes #8642.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Michael Crosby <crosby.michael@gmail.com>
Upstream-commit: e98e56bb1edc3835bc835c9e034780845c64d797
Component: engine
2014-12-01 18:13:52 -08:00
3e14694b93 Merge pull request #9330 from TomasTomecek/master
docs: man docker-images: inconsistent naming
Upstream-commit: b487d2f2ff9562301c1e9a1e705876ff3e3f3c10
Component: engine
2014-12-02 11:42:29 +10:00
bf624ce4b1 Merge pull request #9431 from sindhus/patch-4
Fix dead link build.md
Upstream-commit: b241571102f245a8d526620598930fc53c126070
Component: engine
2014-12-01 20:29:48 -05:00
70cf9e5532 Merge pull request #9425 from HuKeping/master
inspect: format the output of docker inspect
Upstream-commit: 65e75998afc53eacdac8784434dd1a7baa92be70
Component: engine
2014-12-01 16:51:47 -08:00
9254581bd3 Try other port on any error from Map
Sometimes other programs can bind on ports from our range, so we just
skip this ports on allocation.

Fixes #9293
Probably fixes #8714

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a00a1a1fca020d21cb677439160e018bda5c3835
Component: engine
2014-12-01 16:26:30 -08:00
67d69faf00 Check for no Cmd on exec create endpoint
Fixes #9414

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c8a3d31332074ddc226086ff1f0c042b6e120232
Component: engine
2014-12-01 17:54:15 -05:00
d061fa172b Merge pull request #9438 from crosbymichael/label-std-mounts
Label std mounts
Upstream-commit: bdaf562b4c23feda1f8e790ad456d9bbf982e0af
Component: engine
2014-12-01 14:37:42 -08:00
8eef20faf0 Merge pull request #9439 from blakery/master
Cleanup: remove obsolete workaround
Upstream-commit: 92c840c87de759411229e3d1ace9f8a41cba83dc
Component: engine
2014-12-01 13:14:47 -08:00
e178f59d16 Label standard mounts within loop
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 305e9cd2fab974c38064a1acd2ef1f552a3a1357
Component: engine
2014-12-01 14:54:14 -05:00
e1900eef38 Merge pull request #9407 from hqhq/hq_fix_comments
flag: fix the comments
Upstream-commit: 42522d29c7351d960e2346f1e19e0ac6f7ce7ad5
Component: engine
2014-12-01 11:27:06 -08:00
667cbd6ea9 Merge pull request #9424 from irachex/pprof_block
Attach goroutine blocking profiler
Upstream-commit: 2df1365819c061936efb0b3d1afa3cc623216d64
Component: engine
2014-12-01 11:13:05 -08:00
539a7bfbcc Merge pull request #9378 from LK4D4/change_breakout_detection
Change symlink breakout detection logic in archive package
Upstream-commit: 8ddb42fbfd692a9888c1e8e9ebacefed62e123ef
Component: engine
2014-12-01 19:23:18 +02:00
9bbfd296f7 remove obsolete workaround
Signed-off-by: Blake Geno <blakegeno@gmail.com>
Upstream-commit: 9200fdd197f7c80c495597104928596516b36f41
Component: engine
2014-12-01 11:44:13 -05:00
8985d88694 Fix dead link build.md
Upstream-commit: 7754ef1f064be08419bf397e2ea7e4ce99bdf90d
Component: engine
2014-12-01 19:35:58 +05:30
81cd0946d7 Fix dead link cli.md
Upstream-commit: b1dc0db56ac9a27d51ab2a3684ed398d7b80a80c
Component: engine
2014-12-01 19:28:02 +05:30
71ee90ecd5 Fix dead link in oracle.md
Upstream-commit: ffda2035e5a9e6a723c4c84cd5f88c5f4a9dc2ba
Component: engine
2014-12-01 19:07:04 +05:30
cc225fbb9e Attach goroutine blocking profiler
/debug/pprof/block is 404 currently

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 51172493ab6d2b31760b9fe273c7d4d0917a9bb7
Component: engine
2014-12-01 16:46:59 +08:00
a5fafedf3b inspect: format the output of docker inspect
Prior to this patch, one would get the output of docker inspect xxx
as below:

user@server:/mnt$ docker inspect ubuntu
[{
    "Architecture": "amd64",

    ...

    "VirtualSize": 199257566
}
]user@server:/mnt$

The last ']' was on the same line with the prompt, i wonder if it is
really what we want it be, it is a little weird, so i add a '\n' to it.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 921346be48d20a66b2b5763144b064395285bb32
Component: engine
2014-12-01 16:28:08 +08:00
9fbeae3448 Merge pull request #9421 from nealmcb/9418-registry_api-source-link
Fixes #9418 Docker Registry now open source
Upstream-commit: 653be15f176fc64a442bc68e67dda89d4b14008c
Component: engine
2014-12-01 01:11:49 -05:00
65d8f4630e Fixes #9418 Docker Registry now open source
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
Upstream-commit: 4bf72613fed9424356e2146d795ddbfa825befa4
Component: engine
2014-11-30 21:12:57 -07:00
0ed56d2477 Merge pull request #9194 from flavio/update_installation_docs
Update installation docs
Upstream-commit: 595cd5279e90f1225eb015708b3db5e2e8766c0f
Component: engine
2014-12-01 13:18:12 +10:00
778a7bdfd3 Merge pull request #9322 from javawizard/patch-1
Correct inaccuracy in docker pull documentation
Upstream-commit: 3fce883a95b752bce13e84b2470bc9225881d6c5
Component: engine
2014-12-01 12:53:33 +10:00