1c550a00a4
Follow symlinks inside container root for build's ADD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0fb01fd8fe376a3518b1050ab62f2b3370d62535
Component: engine
2014-03-27 02:07:35 +00:00
aa3273eb2a
Merge pull request #4855 from unclejack/update_release_v0.9.1
...
Update master for release 0.9.1
Upstream-commit: ab00619c56738c0704374c68fb43f4dd90b8887e
Component: engine
2014-03-26 11:43:13 -07:00
40b880e003
Change version to 0.9.1-dev
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: b2721e05ce4d6026855718ad9b01eb7dec797cd2
Component: engine
2014-03-26 00:18:45 +02:00
a34af92d8d
Bump to version v0.9.1
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
VERSION
Upstream-commit: d36176652ef8f0220a1cff5dc00933400c69a562
Component: engine
2014-03-26 00:18:19 +02:00
365103a8e5
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
Upstream-commit: 5506e4b62dfad9d79fbeed91b9696fb51c736631
Component: engine
2014-03-25 14:37:27 -07:00
da42bdb7df
Merge pull request #4628 from kippandrew/port-allocator
...
Fix port collision with dynamically allocated ports
Upstream-commit: abef5cb0fcd107c751b7390bc7eb45e3ecd675e6
Component: engine
2014-03-25 14:30:10 -07:00
e9aaf94539
Merge pull request #4794 from alexlarsson/dm-better-shutdown
...
devicemapper: Better/faster shutdown
Upstream-commit: 6643cc20fe16f36ffb3342bec61a3c0f24d2a9df
Component: engine
2014-03-25 14:03:00 -07:00
d977af9bd0
Merge pull request #4842 from pda/installer-devicemapper-comment
...
Update AUFS comment in install.sh
Upstream-commit: e99297e4ebb716b37197f0f72bf35ad59399f669
Component: engine
2014-03-25 14:29:46 -06:00
6acb821d1b
install.sh (get.docker.io) aufs comment updated.
...
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].
Comment updated accordingly.
Citation [1]: 267ca39921/runtime/graphdriver/driver.go (L40-L46)paul@annesley.cc > (github: pda)
Upstream-commit: 576278102e0fa9166711f8cf23ec972fcccc085e
Component: engine
2014-03-25 11:33:16 -07:00
70fdc926f2
docker load: added example of a multiple tag image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 2517370088ad11765f99d75c16b58e93fe18f85a
Component: engine
2014-03-25 08:30:59 -04:00
674da9e17c
Merge pull request #4845 from noducks/link_fix
...
Force flag to prevent file already exists error.
Upstream-commit: d9c11163035d3bd3d3b4a6eea46f5f57e5428b56
Component: engine
2014-03-25 21:03:04 +10:00
05ba4a16d9
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com > (github: noducks)
Upstream-commit: 8e434c314ef74618001cc95466c2b567fa0283e2
Component: engine
2014-03-25 10:26:45 +00:00
f32e1ed77b
Merge pull request #4814 from noducks/master
...
Reminder for OSX users not to use SUDO
Upstream-commit: 30d25a3d27a80f0fcf0b9641e5d811f98e225d20
Component: engine
2014-03-25 20:15:39 +10:00
df52e0a2f8
Reminder for OSX users not to use SUDO
...
Useful for those who haven't made it to the examples page yet. dad4a998dconemannoducks@gmail.com > (github: noducks)
Upstream-commit: 69087f2d2397b18d6dd2d7b994e24ea9814e4bcd
Component: engine
2014-03-25 09:42:59 +00:00
e26ac10f84
docker load: doc clarification
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: c6c7c03cddc852c42b9f047fbd5c2fb6cecf39eb
Component: engine
2014-03-24 23:36:07 -04:00
2e34f473ea
Merge pull request #4839 from bflad/chef-docker-docs
...
Add Chef usage documentation
Upstream-commit: 267ca39921c35826ccbdb84fbbc0690bfef385d7
Component: engine
2014-03-25 12:38:45 +10:00
1bb9a4e471
Fix typo in Using Chef documentation description
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
Upstream-commit: c84ff187c62060f20b7039a5005a44012898df7b
Component: engine
2014-03-24 22:29:54 -04:00
deed2b6616
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 84e1fdf35d9d6493d389a8e8be3ab41190004b30
Component: engine
2014-03-24 21:43:26 -04:00
68d9a195f9
Add Chef usage documentation
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
Upstream-commit: bb034c6b42c347ffdfae834960bf2386429e1980
Component: engine
2014-03-24 21:39:15 -04:00
3c6aacdcbb
Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm
...
add a note that --lxc-conf is lxc-driver only.
Upstream-commit: 0b2b5a594b6aadaffeab1d6ce823717390111f1e
Component: engine
2014-03-25 11:21:06 +10:00
6bdc8cd953
Merge pull request #4751 from enokd/master
...
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
Upstream-commit: 4585d2da3e62a8c41c212f32cd77b510a2f123b0
Component: engine
2014-03-24 17:43:02 -07:00
8832e97391
Merge pull request #4837 from crosbymichael/remove-ci
...
Remove docker-ci code from the repo
Upstream-commit: e1035535ec878c8c837bd1fdd433169dd9b5da42
Component: engine
2014-03-24 18:01:26 -06:00
186280f667
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
Upstream-commit: a258d048a221d2598f7317ee8e64765cb20fd588
Component: engine
2014-03-24 16:52:08 -07:00
665275b36f
Merge pull request #4835 from crosbymichael/reverst-stop-kill
...
Revert back to the default stop functionality of SIGKILL after timeout
Upstream-commit: c3ff1f41bbc03ad8fd6dad6461660ecf6c6ee67d
Component: engine
2014-03-24 16:33:38 -07:00
ac424b1fd8
Merge pull request #4832 from LK4D4/fix_events_hanging_#4804
...
Workaround for hanging events. Fixes #4804
Upstream-commit: dece260f3aef2c98c95f3f06ff5ffbf1da3b1f39
Component: engine
2014-03-24 16:26:50 -07:00
ec5934f5dd
Workaround for hanging events. Fixes #4804
...
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c7540b3e94d7712b6b91ba80de0155f20156f3f3
Component: engine
2014-03-24 22:31:32 +04:00
aa4d9df883
As far as I know this code is not used or maintained
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f41135bc11b9a4da896e5054a73afa112b2e835f
Component: engine
2014-03-24 12:39:56 +00:00
aa948163e7
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d503714285143013d9fa6932ee5775fd155d26d2
Component: engine
2014-03-24 12:03:56 +00:00
a7b2642223
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f1bd79ec97c125148c690d66ebd3ac5ab3f388b2
Component: engine
2014-03-24 12:03:41 +00:00
90b90efe51
Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714
...
Remove duplication of Dns in config merging.
Upstream-commit: 5294bf7e67a67b2f0643c61fb126814d82a1979d
Component: engine
2014-03-21 17:08:06 -07:00
08c755a87a
Merge pull request #4800 from vieux/rename_network_driver
...
rename lxc to bridge
Upstream-commit: 97e5295f437bbb9eae26c99842b269aae1b427c2
Component: engine
2014-03-21 16:52:40 -07:00
f79fdc8091
Merge pull request #4761 from ichik1/fix-display-of-since-time-exit
...
Fix since time exit display when s.FinishedAt is zero
Upstream-commit: de450b23bea244747953229c2ba43ca4a78c7368
Component: engine
2014-03-21 16:48:30 -07:00
8e8f727f50
Fix since time exit display when s.FinishedAt is zero
...
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
Upstream-commit: 4002eac8b8b4007de03e78dbd57232fac583d05b
Component: engine
2014-03-21 15:28:02 +09:00
d8e651280a
Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org
...
Resync the DCO text with upstream at http://developercertificate.org/
Upstream-commit: 69db8065426f6db4d27a08324b2a729f383f05eb
Component: engine
2014-03-20 23:07:08 -07:00
3d953ff4c8
Merge pull request #4803 from alambike/patch-1
...
Added Eixo::Docker to the list of libraries
Upstream-commit: 14502f0f1cea7ccb7433374484e90efb5551187d
Component: engine
2014-03-21 12:49:51 +10:00
abc3562e62
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com > (github: alambike)
Upstream-commit: 79c11b19ecd506bd76db391b896cec0d4263183d
Component: engine
2014-03-21 03:13:06 +01:00
66a0a60a2a
Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs
...
Fix double single dash arg issues in docs
Upstream-commit: 8329cd55e138fb4c1d18675e2a1c7d8afde61c84
Component: engine
2014-03-21 11:18:21 +10:00
6ed3664799
Harmonize / across all name-related commands/Validate images names
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Upstream-commit: 43c3ee3ba154e2480191ed3743391810f23f29af
Component: engine
2014-03-21 00:40:58 +01:00
2352431354
rename lxc to bridge
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8944fb2e9b07d5a764f8d48065b9afd73364f640
Component: engine
2014-03-20 21:51:28 +00:00
0164d2be10
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
2014-03-20 14:14:54 -04:00
ca4686cb04
devicemapper: Better/faster shutdown
...
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.
We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.
Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
Component: engine
2014-03-20 17:38:35 +01:00
c2f15d709c
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
2014-03-20 09:10:32 -07:00
dbde2deea4
Merge pull request #4790 from tianon/fix-release
...
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
Upstream-commit: 2678af4ea8576816c5635f9c8e0d927f8faf4de1
Component: engine
2014-03-19 22:49:19 -06:00
d4638ba0e0
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6b46a09186b6a53959d567014b8d0e1cff761bc8
Component: engine
2014-03-19 22:25:09 -06:00
5c73b528de
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
Upstream-commit: 372b7282cbbd09383ae0844eed9d09161dc20b42
Component: engine
2014-03-19 18:19:25 -06:00
0f7c241763
missed a bug
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 62eb23aed50c9c820836c4b3f515cba2660b5c20
Component: engine
2014-03-20 10:18:08 +10:00
17b4dbb455
I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: a8cc6ebb181abf58b12ed6ee037711f0b2f1eff2
Component: engine
2014-03-20 09:59:54 +10:00
694ecbc3a5
Harmonize / across all name-related commands
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands:Return an error when repeated /
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Upstream-commit: e38e977a0410b754b6f318ff973dc15e6d756023
Component: engine
2014-03-20 00:45:29 +01:00
a1f1abe495
Merge pull request #4708 from SvenDowideit/sign-releases
...
Add md5 and sha256 to binaries on get.docker.io
Upstream-commit: 43124b5613d74ed832ed9f9684506e10ae1c7d98
Component: engine
2014-03-19 17:38:07 -06:00
04a08a7053
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 43febdd432eb8e7dc5988c72710b3d78a5913360
Component: engine
2014-03-20 09:35:58 +10:00
