766980f441
add some debug to runtime.restore()
...
Upstream-commit: fde909ffb8e09ae39310093b7389f61aa4ec29df
Component: engine
2013-12-18 10:57:21 -08:00
de668bdcfd
Merge pull request #3264 from creack/fix_osx_compilation
...
Fix osx compilation
Upstream-commit: 553b4dae453fccf3dee1e36099cc5bb67129f69f
Component: engine
2013-12-18 10:50:14 -08:00
83a9d711e3
Merge pull request #3266 from tianon/fix-integration-test-building
...
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
Upstream-commit: 929662a4d53ebad32100abb5acfbc2c073631708
Component: engine
2013-12-18 10:37:55 -08:00
70fa345719
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
...
Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
Upstream-commit: fbac8125408c076317f3f51239394cd6b7351b49
Component: engine
2013-12-18 11:32:25 -07:00
9b574d4dfb
Fix OSX compilation for aufs
...
Upstream-commit: e481c82fa9521ecc719b29b314543a205c0b53ec
Component: engine
2013-12-18 10:18:49 -08:00
f609f65b61
Fix OSX build for sysinit
...
Upstream-commit: 73a1ef7c22f5cde9db5e1292f1340885bf28e807
Component: engine
2013-12-18 10:16:48 -08:00
624a293ce3
Canonicalize our root path before we try using it, because we make assumptions about it not containing symlinks
...
Fixes #3242
Upstream-commit: c91c365f8860315d29a17368b78dcefb23674042
Component: engine
2013-12-18 11:15:09 -07:00
3222062547
archive: Re-add XZ compression support
...
This shells out to the xz binary to support .tar.xz layers, as
there is no compression/xz support in go.
Upstream-commit: b8a4f570fb31091f43caeba5b824ae38a5bc69e8
Component: engine
2013-12-18 10:50:22 +01:00
5f28e84d16
Merge pull request #3128 from codeaholics/1530-improve-error-message
...
Improve error message when refusing to remove image due to multiple repo tags
Upstream-commit: 70c7220a990ba522a12baed8d8c7aa06af7f8547
Component: engine
2013-12-17 20:49:25 -08:00
2ad1bde3a1
Merge pull request #3205 from cddr/Vagrantfile-typos
...
Fix typos in Vagrantfile
Upstream-commit: 0f45e3c6e0e090ee980b6decf6769feaf133f617
Component: engine
2013-12-17 20:41:53 -08:00
7b1b83e614
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
Upstream-commit: be0beb897aeed280fe1964feaebe4411b5547fc8
Component: engine
2013-12-17 20:40:36 -08:00
248b8ee5ee
Merge pull request #3253 from titanous/update-container-name-validation
...
Update container name validation
Upstream-commit: 8fa4c4b06260e8ac845937ca5f73ef2e7498e821
Component: engine
2013-12-17 20:34:53 -08:00
a3e0fa246c
Add container name validation test
...
Upstream-commit: c06ab5f9c237a647120b9b3cc433e094676fe75a
Component: engine
2013-12-17 20:19:23 -05:00
b6d7266c64
DRY up valid container name pattern usage
...
Upstream-commit: 3ec39ad01a5823acbb3c4ce49ce5c81258a60815
Component: engine
2013-12-17 20:17:50 -05:00
3c037baf07
Add '.' to valid container name pattern
...
Upstream-commit: 1940015824f5dabf1e8ffbd0c2b7c09f11f8cdf0
Component: engine
2013-12-17 20:17:06 -05:00
7df1c5a0f0
Merge pull request #3234 from creack/default_unix_path
...
Default unix path
Upstream-commit: 1acefac97eafdb8e701763da8616b607be4f0510
Component: engine
2013-12-17 16:24:01 -08:00
ddd720195c
Merge pull request #3228 from maztaim/patch-1
...
Update binaries.rst
Upstream-commit: f630fbc7cf76fb123efff855de465a140e470754
Component: engine
2013-12-17 13:10:08 -08:00
e23f296b66
Merge pull request #3250 from vincentwoo/patch-1
...
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
Upstream-commit: e61f327ec98c3e3620471970f8c07f5e68aac3d2
Component: engine
2013-12-17 13:09:37 -08:00
295882518c
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
...
Upstream-commit: c4444ce48fac417847f95a11024667d48e715a52
Component: engine
2013-12-17 11:48:21 -08:00
80983f7def
Merge pull request #3236 from dhrp/doc-master-warning
...
Added warning when browsing master. & no longer hides alternative versions
Upstream-commit: 7ba0f1f421fea08728675d9ec424b97ad51cd695
Component: engine
2013-12-17 11:17:17 -08:00
57ff515d90
Merge pull request #3249 from tianon/fix-sphinx-warning
...
Fix minor sphinx warning
Upstream-commit: 30454bb85ca30cec9e904e75f5d9c4e436d54858
Component: engine
2013-12-17 11:03:44 -08:00
9af351f520
Merge pull request #3248 from lsm5/docker-fedora-conflict
...
Docker fedora conflict
Upstream-commit: 2deb0c3365a5d0f8825c7fd2139f3a6cdcba2016
Component: engine
2013-12-17 11:01:37 -08:00
96dc4ccb26
Removed unnessary span element from version floater and
...
Replaced social footer by the one from www.docker.io
Upstream-commit: efc0610c0eec78850e0fc1e4f09bb294693a31e5
Component: engine
2013-12-17 10:39:22 -08:00
ab2b80c344
Merge pull request #3221 from jamtur01/introlink
...
Updated Introduction link
Upstream-commit: 391676b59875ef08e3f42bd4a80fde9b5c100f32
Component: engine
2013-12-17 10:36:00 -08:00
3d79d324f2
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
Upstream-commit: 5204feeaa98a58602d02e81e567dabf1f762921e
Component: engine
2013-12-17 10:09:40 -08:00
2756066cbe
Fix minor sphinx warning
...
Upstream-commit: 81d112cb7fc19e4919f9916c08d8409c74aa117a
Component: engine
2013-12-17 10:38:55 -07:00
2b1ed3c336
Fedora first letter capitalize and misc. rewording
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 25be0b1e987934ca39085894730b54f4bbcd8ad2
Component: engine
2013-12-17 11:32:40 -06:00
69694aee06
Merge pull request #3239 from tianon/old-go-not-supported
...
Purge more hack references to Go 1.1.2
Upstream-commit: c56b0452704664fdf5ad4eda2c81379d4cd8f5c5
Component: engine
2013-12-17 09:08:42 -08:00
bc4bacc415
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
Upstream-commit: d9a1cc7e2beb9a8956ed97328a945868db107f52
Component: engine
2013-12-17 09:06:52 -08:00
3fa358de88
docker and docker-io conflict update for epel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 30b4a0f76a63f24f96ba588216990f0ae7cd60a2
Component: engine
2013-12-17 10:56:31 -06:00
fccc41956a
update fedora doc: docker and docker-io conflict
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 7d95145b76decc511bc78d887ec3843bd182e58a
Component: engine
2013-12-17 10:33:52 -06:00
43c7f2497f
Update docs
...
Upstream-commit: 379a7fab0717475353e3f6f4ac0ccbc13a55e86e
Component: engine
2013-12-17 07:55:36 -08:00
daea5c989f
Tidy up some of the error messages from apt during build
...
Upstream-commit: 36e060299f2c3d73b26f556f73ba58a9738fd23e
Component: engine
2013-12-17 13:50:37 +00:00
c725c9d310
Handle compressed tars in ApplyLayer
...
When pulling from a registry we get a compressed tar archive, so
we need to wrap the stream in the right kind of compress reader.
Unfortunately go doesn't have an Xz decompression method, but I
don't think any docker layers use that atm anyway.
Upstream-commit: a96a26c62f6333e61134759256db43a7f5946631
Component: engine
2013-12-17 14:19:48 +01:00
fe64f8a242
Improve error message when refusing to remove image due to multiple repo tags
...
Upstream-commit: c3705e83e7eac1e67dbb9c6fc354063bbe43eae6
Component: engine
2013-12-17 12:34:25 +00:00
d083287985
Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)
...
Upstream-commit: 5e9b4a23e6bde9e7d65ebc8b4bdfec4e1486df3a
Component: engine
2013-12-16 23:57:54 -07:00
2433f050d8
Add "-a" back to our "go build"
...
Upstream-commit: a1c5e276f4cfe4ab498b6e013e61bfc957ce6852
Component: engine
2013-12-16 23:50:03 -07:00
55aa26742d
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
...
Upstream-commit: eddda577a4dd7f8fb4fb67fd1600c2a7c5de40c7
Component: engine
2013-12-16 22:54:06 -07:00
a7db351ec0
Allow packagers to specify a custom dockerinit lookup location via DOCKER_INITPATH in dynbinary
...
Only necessary if distro policy dictates that the path deviate from the paths already listed in utils/utils.go - please refrain from using it otherwise.
Upstream-commit: 2ed1001c57646f6869016739a8e177bb52f32e2a
Component: engine
2013-12-16 22:29:08 -07:00
c79738b3bc
Add dockerinit SHA1 and path to "docker info" when debug mode is enabled
...
Upstream-commit: f02d766f9a93bf86c6473eb2772bc239ffaa1cd6
Component: engine
2013-12-16 22:29:05 -07:00
af74b97c6a
Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed
...
Upstream-commit: 2035af44aae3664b217d6903cbf39c259f568490
Component: engine
2013-12-16 22:29:00 -07:00
ffd30c0904
Added warning when browsing master. & no longer hides alternative versions.
...
Upstream-commit: 746ae155fb5a17c9f31873ad6d387b58574849ba
Component: engine
2013-12-16 18:36:35 -08:00
cba2c66d12
Add CHANGELOG.md entry for ADD caching.
...
Upstream-commit: a26801c73f535b2e57366b9d6de0453e7c732884
Component: engine
2013-12-16 17:38:16 -08:00
75328e1a1d
Add self to AUTHORS.
...
Upstream-commit: 670b326c1b88d66ef941de5f27867ba6132762a1
Component: engine
2013-12-16 17:36:51 -08:00
7900d7c420
Add testcases for ADD caching, closes #880 .
...
Upstream-commit: 15a68541196b9b9338923ece6c6b4a69929652d6
Component: engine
2013-12-16 17:36:51 -08:00
981ec0641d
Record added-tree sha256 in buildfile.CmdAdd, probe and use cache.
...
Upstream-commit: 3f9416b58da029b7d82a4908f6c066cee0695edf
Component: engine
2013-12-16 17:36:51 -08:00
7ca46955f3
Factor cache-probing logic out of buildfile.commit() and CmdRun().
...
Upstream-commit: 7afd7a82bd672bf7b3976458197b8c56c17407de
Component: engine
2013-12-16 17:36:50 -08:00
bac1f7d5e4
Merge pull request #3207 from alexlarsson/fix-applylayer
...
Re-enable TestApplyLayer and make it work
Upstream-commit: 124da338fd1c238c8b8e76b15db642104eac1b23
Component: engine
2013-12-16 16:55:48 -08:00
d49fddb652
Improve TestParseHost
...
Upstream-commit: 69a31c33864abeaacbe9a07e50dd0cd8d406b15e
Component: engine
2013-12-16 16:35:56 -08:00
706b718f39
Allow to use -H unix:// like -H tcp://
...
Upstream-commit: 20605eb310f0b57bd06eea80ec63c5022fc83bde
Component: engine
2013-12-16 16:30:23 -08:00
