8f61d5e8bf
Fix unmounts out of container export funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 02fdc194fc726ef2ce1fa4303e121abd277f8d32
Component: engine
2014-02-03 16:14:16 -08:00
0cee6d0d01
Do not call Put twice and do not call it on defer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d277a4c0f811e86179770f5098b30adf065567c8
Component: engine
2014-02-03 16:14:02 -08:00
10838a4c46
Merge pull request #3908 from crosbymichael/fix-login-prompt
...
Fix login prompt on push and pull because of error message
Upstream-commit: 4e9164ff5f84fd9228faca5e6bbe4729b6946b14
Component: engine
2014-02-03 14:19:14 -08:00
d097de6654
Merge pull request #3911 from crosbymichael/fix-remove-volume
...
Fix comparing binds and volume ids from other containers
Upstream-commit: a9860d85530e0cb69d08cbab674fbcb503be5cc1
Component: engine
2014-02-03 14:03:57 -08:00
386288ab8c
Fix comparing binds and volume ids from other containers
...
Currently comparing volume ids for binds and other containers are broken
Fixes #3749
Fixes #3885
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 720c5774e9a9cd510320a142848832f7cd314da7
Component: engine
2014-02-03 13:18:10 -08:00
3bf67918b9
Fix login prompt on push and pull because of error message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0fa9199f781ecd27469ca192496ce7b8e24980b1
Component: engine
2014-02-03 11:38:34 -08:00
fe0650e258
Merge pull request #3906 from tianon/unprefix-ubuntu
...
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
Upstream-commit: 88d66600b3b8d71300151008c5d9eb58a799d9c9
Component: engine
2014-02-03 10:28:50 -08:00
4621ae86b1
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
...
Everyone probably wants to run `docker pull ubuntu` before building with this change.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f4a7c437769b5cf25d852d1aee6a6c50ee42fc85
Component: engine
2014-02-03 11:08:35 -07:00
f8aac524dd
Merge pull request #3904 from alexlarsson/fix-docker-commit-output
...
Fix docker commit output
Upstream-commit: 686314514830547dafd7c736acee4a4a758b0ae9
Component: engine
2014-02-03 10:00:53 -08:00
23812229e0
Merge pull request #3893 from tianon/clean-up-btrfs-error-messages
...
Fix several btrfs driver error messages
Upstream-commit: 9431b8d503e1fc02e22431fded0c15e4a7dc4b0c
Component: engine
2014-02-03 09:51:41 -08:00
67cb10e065
Merge pull request #3892 from tianon/remove-btrfs-header-reference
...
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
Upstream-commit: fb796900fbcd11ae63e918f91b226463619bb152
Component: engine
2014-02-03 09:41:11 -08:00
e9fcfe019f
Fix several btrfs driver error messages
...
Several of the error messages were wrong, but not one of them was helpful, so this fixes them to include the important information (the actual error), and a correct description of which operation failed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f7f8e3c2b3818d351781f96ef68432eba0fc2fda
Component: engine
2014-02-03 09:12:18 -07:00
e5c74c87ff
Merge pull request #3899 from tianon/do-not-strip-binaries
...
Update PACKAGERS.md to explicitly talk about stripping
Upstream-commit: 62aa446101bbbe9a5ad46762828d711eb9fad094
Component: engine
2014-02-03 07:08:49 -08:00
52ef7a7013
Fix docker commit output
...
The id is returned as Id, not ID, so print the right thing.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: b61c1d0d42777023a6248c6e9de4bb4877a1857b
Component: engine
2014-02-03 14:59:09 +01:00
f2667b61da
Update PACKAGERS.md to explicitly talk about stripping, quoting Dave Cheney from Golang upstream (who is very, very adamant about not stripping Golang compiled binaries)
...
While there, remove the now-outdated section about `CGO_ENABLED=0`
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7ffd2b0785529b0b71bec90c8468dc3cb4b37525
Component: engine
2014-02-02 22:47:42 -07:00
6732035ba0
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
...
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6922f1be08111d889b0585b763b08f92d7a55e05
Component: engine
2014-02-01 23:23:33 -07:00
a5ec5d6bb6
Merge pull request #3832 from jlhawn/3831-auth-tests-server-address
...
Prevent Tests from creating users on Prod Index
Upstream-commit: a446b347199b3b19abf06e2ccf115d926917620f
Component: engine
2014-01-31 18:34:13 -08:00
8b69044d5c
Merge pull request #3881 from crosbymichael/no-all-number
...
Do not generate all numberic truncated ids
Upstream-commit: c9f6e446eedce31c8fde15f8b198069546be3125
Component: engine
2014-01-31 18:07:01 -08:00
31578849e3
Merge pull request #3868 from 1uptalent/3867-allow-pax-global-extended-headers-to-passthrough
...
FIX 3867 allow pax global extended headers to passthrough
Upstream-commit: f9b4146ad48f992d17ca8aa530ab5bef75400c31
Component: engine
2014-01-31 17:54:08 -08:00
b5105f20b1
Do not generate all numberic truncated ids
...
Fixes #3869
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9b7054fd0bc707f7f8e5c9ed9ada5a1664a19a34
Component: engine
2014-01-31 17:37:13 -08:00
85b3df31cc
Merge pull request #3880 from vieux/fix_docker_login
...
fix docker login
Upstream-commit: 87c14039481e69add8c1cc2be70c41e23b6a8d31
Component: engine
2014-01-31 17:31:27 -08:00
1ec7d7b519
Merge pull request #3882 from vieux/fix_compat_api
...
fix api with old version
Upstream-commit: 31ee45e6aecd42f187a25d401ec2488f70e2b332
Component: engine
2014-01-31 17:25:39 -08:00
284cf5fe96
fix api with old version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e43236c78ae8a466a36c323aa679ea581b42cdc5
Component: engine
2014-02-01 01:24:39 +00:00
47dc263009
Merge pull request #3872 from crosbymichael/network-driver
...
Remove networking out of core and into a driver
Upstream-commit: 819c2e3ecaaa1f82401fe76bae1715183426c3cf
Component: engine
2014-01-31 17:22:37 -08:00
c7f2da1d18
fix docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: d22a39db265dbf68cec4ddbc5903372e936094a9
Component: engine
2014-02-01 01:14:59 +00:00
d8c614da79
Merge pull request #3878 from vieux/remove_REMOTE_TODO.md
...
remove REMOTE_TODO.md
Upstream-commit: 23815414eaef5e943037b65303b1691b93942ad4
Component: engine
2014-01-31 15:50:57 -08:00
c1283e0d50
remove REMOTE_TODO.md
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: bf1f655fa2b5112301102f9191e0f0deb68975f1
Component: engine
2014-01-31 23:50:34 +00:00
4a2ebcd7e5
Merge pull request #3827 from vieux/mova_api_package
...
Move api into sub package
Upstream-commit: 6a1ee89d2dcd5f2ab99e203862eed4dd8675b070
Component: engine
2014-01-31 15:39:33 -08:00
140db53b4e
Move serveapi to api/api.go
...
Remove api import from server.go
Rename initapi to init server
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9eea7f28f0c64d43ef2a9987999a29774fa1476b
Component: engine
2014-01-31 23:06:00 +00:00
535edc5a50
Merge pull request #3876 from dotcloud/fix_panic_mflag
...
fix panic in mflag
Upstream-commit: 78189c9bcf1b2ef8ebebbdb48c10b0ce0b8ae583
Component: engine
2014-01-31 14:43:16 -08:00
e11ccc455a
Fix IP case for BridgeIP
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cb3bd91689b9beaaa4e287e126bc8150b5161c57
Component: engine
2014-01-31 12:18:45 -08:00
02ad82ce61
Fix links test to not accept bridge
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 50fea8978257141bf85669b9d757bf184f886a1b
Component: engine
2014-01-31 12:07:51 -08:00
3d90516a7c
Update code from pr #3842 post rebase
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a11bee44d74235ec436c1b2272dc9f718497f88c
Component: engine
2014-01-31 12:04:44 -08:00
e1a338aef6
Fix port mapping unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1d4de9ce1fe2c113cd7e9fcb6055b95c94c65b06
Component: engine
2014-01-31 12:04:44 -08:00
b6b8e6cc38
Move network aspect of links into driver as a job
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 167403988dca37060edf37abbdd28360ee0d5d4a
Component: engine
2014-01-31 12:04:44 -08:00
844634dcc8
Implement requesting the name ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2df01661071e949faabf1fa9ba612c40710b686b
Component: engine
2014-01-31 12:04:44 -08:00
052a914774
Fix integration tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 49b9813035b3abb445ef7238f034897fa03a9652
Component: engine
2014-01-31 12:04:44 -08:00
2879fa9100
Fix sending []byte in job env
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2d8709696c80e992a5b20ba7a00ca3268c57c11c
Component: engine
2014-01-31 12:04:44 -08:00
0b250038dd
Update core calls to network drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c712e74b45005e0f38297d254fb606aa18606d11
Component: engine
2014-01-31 12:04:44 -08:00
fcfec10c8e
Finish moving networking information into driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 90494600d357d01310d8da1310b6ad02f56de22c
Component: engine
2014-01-31 12:04:44 -08:00
3044e71de0
Merge pull request #3841 from alexlarsson/separate-base-fs
...
Separate out graphdriver mount and container root
Upstream-commit: 53ee1daa699ab28fdd37d77b2cfbb0fc14dc0fdb
Component: engine
2014-01-31 11:49:14 -08:00
df82456ed9
Merge pull request #3857 from creack/remove_darwin_files
...
Remove all darwin specific files and use more generic _unsupported with build tags.
Upstream-commit: 523341d994265b9f72e4869f0fd094fd15f1b480
Component: engine
2014-01-31 11:48:10 -08:00
282ae4468c
fix panic in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 65794a2c4960f9065ee439d6823ffe670610dbb6
Component: engine
2014-01-31 11:39:29 -08:00
47c49018cf
Merge pull request #3828 from tianon/add-user-email-to-dockerfile
...
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
Upstream-commit: 674ee1bc8e378063831491bdbb2f8bfdc50cdfd3
Component: engine
2014-01-31 11:03:17 -08:00
32d36c4ba5
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b881a6c3c2e73f2fd342975239331004f0b59e12
Component: engine
2014-01-31 19:00:06 +00:00
db540896bd
Merge pull request #3844 from clkao/lxc-kill-deprecation
...
Use lxc-stop -k instead of lxc-kill
Upstream-commit: f267938fb8db682eb34a9c221a1b8c2288995206
Component: engine
2014-01-31 10:57:40 -08:00
8e78d482bc
Merge pull request #4 from tianon/cross-compile-and-release-linux-i386-and-arm-clients
...
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
Upstream-commit: ff6409382b0f78cf192b007689c68b074f55fc7c
Component: engine
2014-01-31 10:51:25 -08:00
236fdd833b
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 51d280f944eab386ecd67acd6a1878de7b45c8d6
Component: engine
2014-01-31 18:43:34 +00:00
4ca789745b
Merge pull request #3829 from vieux/fix_api_regression
...
Fix ID -> Id api
Upstream-commit: 643c7dc25df4759c1894ba2ff3aa71fe11a06ea4
Component: engine
2014-01-31 10:38:57 -08:00
4ae61a560f
Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc
...
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
Upstream-commit: 70ab72ff32fdfd91e8ba8c2c294c649ec5e2d84a
Component: engine
2014-01-31 10:27:04 -08:00
