1
0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Michael Crosby
8622d70cfb Merge pull request #3276 from tianon/cross-compile
Add new "cross" bundle to cross-compile the Docker client
Upstream-commit: ed93dab9a8d26efd2a6defe6dc60c9db045cb6c0
Component: engine
2013-12-19 10:41:12 -08:00
Tianon Gravi
a7fc58e1eb Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
Upstream-commit: 62a81370fffb3cfdb15ef19702f0ea07ab2f4c36
Component: engine
2013-12-19 11:33:49 -07:00
Guillaume J. Charmes
bdfb29b00e Merge pull request #3274 from tianon/tianon-dockerfile
Make Tianon the official root "Dockerfile" maintainer
Upstream-commit: e74c65c3db579c93d3cf4ead44db8ad2466ba95c
Component: engine
2013-12-19 10:31:00 -08:00
Victor Vieux
179f66cee2 Merge pull request #3277 from jpoimboe/fix-root-symlink
Move root symlink check to engine.New
Upstream-commit: 248eadd341a6a440a085791f8801494598647174
Component: engine
2013-12-19 10:24:23 -08:00
Victor Vieux
bb97c6f261 Merge pull request #3275 from crosbymichael/sqlite-import
Move sqlite conn to graph db for cross compile support
Upstream-commit: e829d5b6d2865417d3161370782176b19550d9d7
Component: engine
2013-12-19 10:18:30 -08:00
Michael Crosby
6a9cefb6c8 Merge pull request #3270 from vreon/tree-box-drawing-characters
Use box-drawing characters in `docker images -tree`
Upstream-commit: 35d8ac94f331fb9efcda68aaa2506ce83820d58e
Component: engine
2013-12-19 10:00:33 -08:00
Josh Poimboeuf
f633c6e7d1 Move root symlink check to engine.New
Since commit c91c365, when starting the docker daemon without an
existing /var/lib/docker directory, it fails with:

  2013/12/18 23:39:36 Unable to canonicalize root (%!s(*string=0xc210077c80)): lstat /var/lib/docker: no such file or directory

Move the symlink checking code to engine.New after the root dir has been
created.
Upstream-commit: 94821a33534a25fe906f3f66e1c06b1f2c877aac
Component: engine
2013-12-19 00:39:12 -06:00
Jesse Dubay
5fd54c24bc Use box-drawing characters in docker images -tree
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...

Before:

    └─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
      |─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
      | └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
      |   └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)

After:

    └─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
      ├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
      │ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
      │   └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
Upstream-commit: d14c162fd621da809baa48e8af007443c4f2ae0a
Component: engine
2013-12-18 22:30:21 -08:00
Tianon Gravi
8a97983c9f Make Tianon the official root "Dockerfile" maintainer, since it's so hard-locked to hack changes most of the time
Upstream-commit: 14d1c5a2c331f9abe4199b1064ff8f642981fa77
Component: engine
2013-12-18 22:29:48 -07:00
Michael Crosby
69bf3879ed Move sqlite conn to graph db for cross compile support
Upstream-commit: 329d154209f8da83226e729222dafff4e214b25d
Component: engine
2013-12-18 21:14:16 -08:00
Michael Crosby
dd4dc32856 Improve interface by moving to subpkg
Enable builds on OSX
Upstream-commit: 7bc96aec7bf978e87cb87935bd55f85e2cb1664a
Component: engine
2013-12-18 16:42:49 -08:00
Michael Crosby
eb112b17e6 Fix unmount issues
Upstream-commit: a6fdc5d208b6726a33d30bd25ab115131a298b90
Component: engine
2013-12-18 15:24:08 -08:00
Guillaume J. Charmes
b713827b64 Merge pull request #3268 from vieux/prevent_panic_volume
prevent a panic with docker run -v /
Upstream-commit: 681b40c8014e8f9d14e7fa43a2d1b4a8d50f1f13
Component: engine
2013-12-18 14:06:44 -08:00
Victor Vieux
a1f6c20284 prevent a panic with docker run -v /
Upstream-commit: 536da93380f1cacb82c344ad09c2daaae29f8ac3
Component: engine
2013-12-18 13:57:49 -08:00
Michael Crosby
8eec37c741 Handle external mounts outside of lxc
Upstream-commit: 45d7dcfea276841cce782feced3a2eb3eab01208
Component: engine
2013-12-18 13:46:02 -08:00
Guillaume J. Charmes
a22a0e3adb Merge pull request #3267 from vieux/debug_daemon_start
add some debug to runtime.restore()
Upstream-commit: 210fa0871c55f6e3f4fc4533008eb298d62981e4
Component: engine
2013-12-18 13:45:22 -08:00
Victor Vieux
ab9277b26a Merge pull request #3263 from tianon/abspath-root
Canonicalize our root path before we try using it
Upstream-commit: f768c6adb766bda5a74e9a5131698e6a75c47882
Component: engine
2013-12-18 11:41:47 -08:00
Victor Vieux
766980f441 add some debug to runtime.restore()
Upstream-commit: fde909ffb8e09ae39310093b7389f61aa4ec29df
Component: engine
2013-12-18 10:57:21 -08:00
Michael Crosby
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
Tianon Gravi
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
Tianon Gravi
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
Guillaume J. Charmes
9b574d4dfb Fix OSX compilation for aufs
Upstream-commit: e481c82fa9521ecc719b29b314543a205c0b53ec
Component: engine
2013-12-18 10:18:49 -08:00
Guillaume J. Charmes
f609f65b61 Fix OSX build for sysinit
Upstream-commit: 73a1ef7c22f5cde9db5e1292f1340885bf28e807
Component: engine
2013-12-18 10:16:48 -08:00
Tianon Gravi
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
Alexander Larsson
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Jonathan Rudenberg
a3e0fa246c Add container name validation test
Upstream-commit: c06ab5f9c237a647120b9b3cc433e094676fe75a
Component: engine
2013-12-17 20:19:23 -05:00
Jonathan Rudenberg
b6d7266c64 DRY up valid container name pattern usage
Upstream-commit: 3ec39ad01a5823acbb3c4ce49ce5c81258a60815
Component: engine
2013-12-17 20:17:50 -05:00
Jonathan Rudenberg
3c037baf07 Add '.' to valid container name pattern
Upstream-commit: 1940015824f5dabf1e8ffbd0c2b7c09f11f8cdf0
Component: engine
2013-12-17 20:17:06 -05:00
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Vincent Woo
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
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Thatcher Peskens
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
Andy Rothfusz
ab2b80c344 Merge pull request #3221 from jamtur01/introlink
Updated Introduction link
Upstream-commit: 391676b59875ef08e3f42bd4a80fde9b5c100f32
Component: engine
2013-12-17 10:36:00 -08:00
Guillaume J. Charmes
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
Tianon Gravi
2756066cbe Fix minor sphinx warning
Upstream-commit: 81d112cb7fc19e4919f9916c08d8409c74aa117a
Component: engine
2013-12-17 10:38:55 -07:00
Lokesh Mandvekar
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
Michael Crosby
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
Guillaume J. Charmes
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
Lokesh Mandvekar
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
Lokesh Mandvekar
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
Guillaume J. Charmes
43c7f2497f Update docs
Upstream-commit: 379a7fab0717475353e3f6f4ac0ccbc13a55e86e
Component: engine
2013-12-17 07:55:36 -08:00
Danny Yates
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