262b85d1ce
Remove PortMapping from container NetworkSettings
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: db4f20404d2b8c4da5a15e447f52cd634445cfe3
Component: engine
2015-09-02 14:32:53 +02:00
4c16768ce6
Merge pull request #16014 from angt/angt-patch-2
...
Fix typo
Upstream-commit: 9ea72672856fe5777f12d6939a2e0c7fca9f5550
Component: engine
2015-09-02 11:25:12 +02:00
49cb61bb67
Merge pull request #15921 from srust/volume_driver_register_retry
...
Retry registering a volume driver
Upstream-commit: 1ed3cb2b6c47d7e3d83882181346f0b9708f3e2c
Component: engine
2015-09-02 11:24:52 +02:00
68cefd3677
Fix typo
...
Signed-off-by: Adrien Gallouët <agallouet@gmail.com >
Upstream-commit: 01059cba78be1796c2152dea53d7f0461aaba1da
Component: engine
2015-09-02 10:43:49 +02:00
16c77243f1
Normalized, ungrouped, and sorted names
...
Signed-off-by: Todd Crane <todd@toddcrane.com >
Upstream-commit: ed14fe2afa77120d07676f30ff61db93ecd38ec9
Component: engine
2015-09-01 21:57:01 -07:00
09cd6b521c
Merge pull request #15989 from tianon/ubuntu
...
Swap "ubuntu-debootstrap" for just "ubuntu"
Upstream-commit: 7f8954cb79c3126f1c099e260f6b420946dcba23
Component: engine
2015-09-01 15:19:16 -07:00
ab638f4a30
Merge pull request #15988 from runcom/use-stringutils-strslice
...
Use StrSlice from pkg/stringutils
Upstream-commit: 3111aa7293f49f550b56652c622b0f4d194aae6f
Component: engine
2015-09-01 14:32:58 -07:00
0e20c40e36
Swap "ubuntu-debootstrap" for just "ubuntu"
...
See https://github.com/docker-library/official-images/pull/982#issuecomment-133207587 .
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: a5eec723f8509c8fe588e3a57d14d6c9df6aa87b
Component: engine
2015-09-01 14:03:49 -07:00
155cdd5cef
Merge pull request #15986 from runcom/add-strslice-tests
...
pkg: stringutils: Add more tests to strslice
Upstream-commit: 7c4420903782bff692ba3c8a0236f836a9865bfd
Component: engine
2015-09-01 12:29:27 -07:00
b67d02c383
Use StrSlice from pkg/stringutils
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 17999c70c39e14a474e69ce10de05a66258e2a5b
Component: engine
2015-09-01 21:23:46 +02:00
3ce116129d
Retry registering a volume driver
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: 45fdce8a0d36d9b0825a6dfb6634a81f9af258af
Component: engine
2015-09-01 14:56:29 -04:00
98ff0ef802
pkg: stringutils: Add more tests to strslice
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: cac8f4f0d057dd89fd2ef16e3a58e96d2fee2e70
Component: engine
2015-09-01 20:27:45 +02:00
6bbc3d3c6c
Merge pull request #15983 from Microsoft/unix-run-test
...
Move run tests out of unix files
Upstream-commit: 70f0d6d84c77a3c425d2d6e790730b5abe2abcca
Component: engine
2015-09-01 10:49:01 -07:00
746e1febcc
Merge pull request #15980 from Microsoft/unix-links-test
...
Moved unix links tests to non-platform
Upstream-commit: 82415adc81df05d616c83c949d8d398a0d4ff3ed
Component: engine
2015-09-01 10:03:54 -07:00
e3bcc2a340
Move run tests out of unix files
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d7eb85bb1f0076ccffbec7c9291cc27d2cc4cc03
Component: engine
2015-09-01 09:42:19 -07:00
d5f4fa7913
Merge pull request #15871 from Microsoft/10662-absolute
...
Windows: Fix absolute checks
Upstream-commit: 2093616d7f4d74fbdd1a48cfc0fa8219840b2d41
Component: engine
2015-09-01 18:38:36 +02:00
42b66ecf1d
Merge pull request #15972 from calavera/remove_containers_ps
...
Remove /containers/ps from the api router.
Upstream-commit: 7f58fb5f014b723073bcea7598ee8ecac9fb2edd
Component: engine
2015-09-01 09:15:35 -07:00
4dabd24bfd
Moved unix links tests to non-platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4fccf8adfa50855afa0ffaed1ea5c22ddaa7b2e4
Component: engine
2015-09-01 09:10:24 -07:00
852f919527
Merge pull request #15834 from Microsoft/10662-fixdockercp
...
Windows: Fix docker cp
Upstream-commit: be8e126a0f301c3bebf01e50349632670c9ab938
Component: engine
2015-09-01 08:41:59 -07:00
49e7160994
Windows: Fix absolute checks
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 49c1b51ae22e54edc2e13f3195583e47b987fc15
Component: engine
2015-09-01 08:41:37 -07:00
c770771c57
Merge pull request #15976 from duglin/MissingDefer
...
Add missing defer to delete temp dir
Upstream-commit: 26fb160610dc5195ef8d84f972a3fc215541a1b3
Component: engine
2015-09-01 17:13:37 +02:00
c60fcca7ee
Merge pull request #15913 from mountkin/abstract
...
abstract the string slice struct to stringutils package
Upstream-commit: 4bb2449188a7d09de5fd35d1be4b35dd5780c825
Component: engine
2015-09-01 17:06:13 +02:00
9783af1dd1
Add missing defer to delete temp dir
...
Minor thing I just noticed
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 51e721ab072441ba6ae14b84613cf2b3acd6316b
Component: engine
2015-09-01 07:19:38 -07:00
7d0cd077a1
Merge pull request #15965 from tonistiigi/pull-goroutine-leak
...
Fix goroutine leak on pull
Upstream-commit: 3b2c9fa049f9fd17936f6188d983fd70df00d746
Component: engine
2015-09-01 09:27:55 -04:00
81b8a83415
Merge pull request #15900 from Microsoft/10662-testinfra
...
Test infrastructure for cross platform
Upstream-commit: 567687fd98d471a3b4a04ba0aa3a595c931799ef
Component: engine
2015-09-01 09:18:29 -04:00
1f4c9f858c
Merge pull request #15927 from SvenDowideit/clean-up-parsehost
...
Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently
Upstream-commit: 5eb4a6b93357d73fa0ec9c952114c0d225be8524
Component: engine
2015-09-01 08:25:59 -04:00
7f33443dc2
Merge pull request #15970 from Mashimiao/cleanup-daemon-commit-unneeded-code
...
daemon/commit: remove unneeded code
Upstream-commit: e98ec2b5675610146f1c6c918f6b1665692d3bca
Component: engine
2015-09-01 14:15:56 +02:00
7db6f3531c
Merge pull request #15958 from vdemeester/14570-contrib-completion-image
...
Add docker ps --filter=… ancestor image bash completion
Upstream-commit: dd4900205563e2f0d3fa01c43ceb27654aeb9ec8
Component: engine
2015-09-01 12:16:52 +02:00
d8058c38dd
Remove /containers/ps from the api router.
...
This route was deprecated more than two years ago in the linked
commit[1]. It's not referenced anywhere in the documentation and it's
time to stop maintaning it.
[1]: 4f9443927edavid.calavera@gmail.com >
Upstream-commit: b5cc077864665290456c5ec724427c1f0d7bc96b
Component: engine
2015-09-01 05:17:35 -04:00
180469a2a4
daemon/commit: remove unneeded code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: ab868ad79c631b2606b479edf12d287b986c72d4
Component: engine
2015-09-01 16:34:07 +08:00
7dbe195606
Add docker ps --filter=… image completion
...
I missed that on #15919 , thanks @albers
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6ae2cb7ad1aea951d50094638f386f78de57080c
Component: engine
2015-09-01 08:47:02 +02:00
cada1c181e
Fix issue #15939 : Hyperlink to MongoDB Dockerfile not found. Replaced with link to file in Github.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: f814ae437fa622c185e544d24bf0662b2337c91a
Component: engine
2015-08-31 19:28:36 -07:00
b060726a85
Merge pull request #15963 from Microsoft/fix-unixtestport
...
Move TestPort out of _unix
Upstream-commit: 84bc41a3fb8a0150448caca8f5f4d7f1a00e23b3
Component: engine
2015-08-31 17:09:59 -07:00
075e783df0
Fix goroutine leak on pull
...
Close the pipeWriter even if there was no error.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3037e4f7c4eec06cf3a5afca6f58ec58b4bdd63e
Component: engine
2015-08-31 15:56:19 -07:00
8216c91a01
Fix typo in test title
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c2b128582bc8ea786b5486578c43d97167805fe
Component: engine
2015-08-31 15:28:40 -07:00
dece7c3355
Move TestPort out of _unix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 68c7d24a12ca54d052cdc033c06f27c19ee5bab0
Component: engine
2015-08-31 14:40:36 -07:00
5450845f26
Merge pull request #15827 from williamh/fix-openrc-script
...
Fix openrc script
Upstream-commit: 166412e529b3d2d49456fb27c117fa714d7aec16
Component: engine
2015-08-31 20:32:00 +02:00
156b9cd3aa
Merge pull request #15926 from moxiegirl/carry-15210
...
add: best practice for security when sharing host directories.
Upstream-commit: c844effeda1af144eee964e62528d7b362bb33a3
Component: engine
2015-08-31 19:51:15 +02:00
c29130b3da
updating again.
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7271dca8cc4570a28feba5a45153497dd452d899
Component: engine
2015-08-31 09:56:35 -07:00
50f9987d87
Updating with SEb's comments
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 95495d20bec49ae338e6fc10f5d4be71bd162370
Component: engine
2015-08-31 09:54:15 -07:00
472d3d817f
Merge pull request #15922 from unclejack/lower_reset_timeout_bufreader
...
pkg/ioutils: lower bufReader reset timeout
Upstream-commit: 3bd8016259711c951bd9b2023c176f7825c5d56c
Component: engine
2015-08-31 18:43:45 +02:00
4e8cadcb64
Merge pull request #15489 from aaronlehmann/pull-updates
...
Show pull progress in terminal for inflight pull requests
Upstream-commit: 84614fdae00fbdb66b5ae6de1c8246c470ef4f5c
Component: engine
2015-08-31 09:37:33 -07:00
4d130b40c6
Merge pull request #15920 from mikebrow/docker-engine-update-to-index
...
Adding additional instructions to the Docker Engine installation/inde…
Upstream-commit: 38ac1f908e07877a1b2d26f73755a45b2ceb240c
Component: engine
2015-08-31 09:35:34 -07:00
07ea70de30
add: best practice for security when sharing host directories.
...
Closes and carries PR #15210
Updating with Seb's comment
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b0fd4f882fd9b8c38a004395ea44b32f06431345
Component: engine
2015-08-31 09:32:42 -07:00
cd128eab1d
Merge pull request #15606 from jlhawn/img_delete
...
[daemon] Refactor image_delete.go
Upstream-commit: 96974170f8ca82dedffbfe54e84b6b1b2f5661d2
Component: engine
2015-08-31 18:22:48 +02:00
e382bc454d
Test infrastructure for cross platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cd18e7bb739b7681507aca48fec36db9104a5e89
Component: engine
2015-08-31 09:10:18 -07:00
76c45eaf41
Merge pull request #15918 from duglin/HttpHeaderTests
...
More httputil tests for the docker header
Upstream-commit: 4ae81e145e9e44ee683597e0d6af13b11086fb5c
Component: engine
2015-08-31 08:48:28 -07:00
456b829615
Merge pull request #15954 from jfrazelle/no-t-install-script
...
we dont need the tty in the install script
Upstream-commit: 3272b3d120fd4ce77a0ac0c8fb6481a6e316e873
Component: engine
2015-08-31 08:45:35 -07:00
aa64926347
Merge pull request #15807 from coolljt0725/remove_remove_redundant_tag_name
...
Minor fix: remove redundant tag name in error message of create failed.
Upstream-commit: 754c10430b1d0e6247e2cdd150bc15291ff87de0
Component: engine
2015-08-31 11:34:40 -04:00
757943440e
Adding additional instructions to the Docker Engine installation/index page per discussions with @moxiegirl.
...
Removed the "Other Linux" heading; Changed the "Next Steps" heading to "Where to go After Installing"
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: e9eaef6f1e85e949980806e979416c8fb03af2b9
Component: engine
2015-08-31 10:25:41 -05:00
