800fcaba4c
Merge branch 'master' into add_some_tests
...
Upstream-commit: be77ee33bca2399b4eb6749253b9c3ab18915783
Component: engine
2013-08-08 14:44:56 +00:00
490527a43f
Merge pull request #1425 from dotcloud/simplify_ProgressReader
...
- Runtime: fix small \n error un docker build
Upstream-commit: 6249cc3373ccc18ae154a8861bb98e772639c0ce
Component: engine
2013-08-07 16:19:42 -07:00
c746f1a64f
Add warning when net.ipv4.ip_forwarding = 0
...
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
2013-08-07 18:28:39 -04:00
41cf866a86
Merge pull request #1093 from monnand/910-login-info
...
* Runtime: fixed #910 . print user name to docker info output
Upstream-commit: 65a4e308258f4cd85237adf4934c630e3b8f1039
Component: engine
2013-08-07 15:09:55 -07:00
3ea6442a29
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
Upstream-commit: 5b8cfbe15c29efd3e72ea97ba87867590aeeba25
Component: engine
2013-08-06 16:09:54 +00:00
82d1681ff0
fix small \n error un docker build
...
Upstream-commit: ba17f4a06a75a66e11b6cf2ca2cdb5bee4f7bfa8
Component: engine
2013-08-06 14:31:51 +00:00
2eadef5023
Added index address into APIInfo.
...
Upstream-commit: 303490168fb53af2528375ca9ec818c7a179a044
Component: engine
2013-08-05 23:36:55 -04:00
d457571635
rebase master
...
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
9660113205
factory generated from one place.
...
Upstream-commit: 5bc344ab73f73a1fb5bea0933a031ad0418cb8f8
Component: engine
2013-08-02 04:10:26 -04:00
1c96da0a53
auth with user agent
...
Upstream-commit: 4bd287e107eab1623a0e77aeaecda77fc26e7536
Component: engine
2013-08-02 03:30:45 -04:00
4e4b48bb11
Server now use request factory
...
Upstream-commit: 6a56b7b391ac967540915c2ee8f82b23714ad84c
Component: engine
2013-08-02 03:23:46 -04:00
5eea0cead3
Merge pull request #1328 from dotcloud/1307_url_port_delete-fix
...
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
Upstream-commit: 0c0077ed6f044f83fff75f2d7a696491fb7fe360
Component: engine
2013-07-31 07:55:06 -07:00
60591c4d11
rebase master
...
Upstream-commit: 6166380d76ad49b0a077569466b29b5352df9105
Component: engine
2013-07-30 16:51:50 +00:00
eac2c76be1
Merge pull request #1268 from dotcloud/refactor_checksum
...
Refactor checksum
Upstream-commit: bcd6ca368556c329063d58c32945753f783adc75
Component: engine
2013-07-30 06:07:54 -07:00
d2c440fbc7
add parallel pull to 1.4
...
Upstream-commit: 46f59dd9333baa578b184eb25b386ac2f41caf04
Component: engine
2013-07-30 12:15:33 +00:00
d85812a80e
rebase master
...
Upstream-commit: e1fa989ec9a2355da2a87707f4909647b69831b3
Component: engine
2013-07-30 11:59:31 +00:00
d8352677c8
Merge branch 'master' into 1237-improve_docker_top-feature
...
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
753746a54d
Make sure the index also receives the checksums
...
Upstream-commit: 5b27652ac6eaf1bc4c2a16e51919ec4272a58fd6
Component: engine
2013-07-29 11:30:21 -07:00
c364da0b51
Remove unused parameter
...
Upstream-commit: 0f134b4bf81a4d0160932852854b190b7ee7e3b9
Component: engine
2013-07-29 11:30:17 -07:00
78c57a64f0
Refactor the image size storage
...
Upstream-commit: 0badda9f1587c11a13dca17c68b30addd757237c
Component: engine
2013-07-29 11:30:17 -07:00
0d6f4c9ed4
Handle extra-paremeter within checksum calculations
...
Upstream-commit: e3f68b22d8f0635a8c08ab56721e56dbe570a49a
Component: engine
2013-07-29 11:30:17 -07:00
e9895c9839
Refactor checksum
...
Upstream-commit: 8ca7b0646e6c4346075656f46847f53c2e868a3d
Component: engine
2013-07-29 11:30:17 -07:00
183aa3c2d9
use ParseRepositoryTag instead on split on : in imagedelete
...
Upstream-commit: 63876e7dbdd372745855345632af62b8cd976dfa
Component: engine
2013-07-29 12:15:27 +00:00
cdbe046a76
add regression test
...
Upstream-commit: e592f1b298c778d0b9adfd6751f5fe1843a7001d
Component: engine
2013-07-26 10:30:36 +00:00
8f7401af36
fix wrong untag when using rmi via id
...
Upstream-commit: e608296bc62ceeaf41ebf2bc80b21c0a1883d4f0
Component: engine
2013-07-26 09:19:26 +00:00
a761fb8db0
improve client output
...
Upstream-commit: 8742649aa7f3524bbfa99b68c8d87ffc5aba0af9
Component: engine
2013-07-24 17:10:59 +00:00
53749f98ce
Add ID to JSONMessage in pull
...
Use goroutines to pull in parallel
If multiple images pulled at the same time, each progress is displayed on a new line
Upstream-commit: 0e71e368a8a781f593b25fdd1318d3882e6d28e5
Component: engine
2013-07-24 15:41:34 +00:00
5d6f4f6624
Merge pull request #1243 from dotcloud/add_lxc_version_docker_info
...
*Client: LXC and Kernel version to docker info in debug mode
Upstream-commit: dfc076a123d4792444f980e294b2d82ab928e888
Component: engine
2013-07-24 07:44:23 -07:00
0d08c8550d
rebase master
...
Upstream-commit: 066873ebd25728fe702fc4b13ed12b5c8be15b97
Component: engine
2013-07-24 14:38:40 +00:00
94cce8e9a8
Merge pull request #1064 from monnand/156-user-agent-header
...
Add user agent when calling the registry
Upstream-commit: f6e1055727877a255418513c4ffc3271bf214530
Component: engine
2013-07-24 06:40:53 -07:00
743adaf705
add kernel version
...
Upstream-commit: 6057e6ad70ba4550df358e89b9a7e1da61666604
Component: engine
2013-07-24 13:36:55 +00:00
8d3c08d3c7
bump master
...
Upstream-commit: ca39f15fa3285e86660cc66d2c3e446e12c9ce86
Component: engine
2013-07-24 13:28:01 +00:00
e919f6ad2f
versionCheckers()->versionInfos().
...
Upstream-commit: 1ae54707a0ee1f690a7dca17d83b5417e83704c3
Component: engine
2013-07-23 17:17:31 -04:00
0da0fa300a
Rename: VersionChecker->VersionInfo.
...
Upstream-commit: ede1e6d4754f3cffeac72f5d760fe4d87c5ae570
Component: engine
2013-07-23 17:05:13 -04:00
ae5b19f002
use non-blocking channel to prevent dead-lock and add test for server
...
Upstream-commit: 040c3b50d0a56baf98bd1ec14ad7d59c55a4ab31
Component: engine
2013-07-23 15:42:34 +00:00
012e944035
add since for polling, rename some vars
...
Upstream-commit: 2e4d4c9f60d0ad92ab0cc84c56c060678222c4db
Component: engine
2013-07-23 15:41:19 +00:00
fd89a1c59f
add timestamp and change untagged -> untag
...
Upstream-commit: b8d52ec2669332988a972bff3b5f5d2e9d526b33
Component: engine
2013-07-23 15:41:19 +00:00
d1efb7843b
basic version of the /events endpoint
...
Upstream-commit: b5da816487d68853a8ac46630cb3118646f71d2d
Component: engine
2013-07-23 15:41:19 +00:00
2e339a6cec
Merge branch 'master' into 1237-improve_docker_top-feature
...
Conflicts:
docs/sources/api/docker_remote_api.rst
Upstream-commit: c81662eae473e2b35e4e449be18cc6dfda07e4ec
Component: engine
2013-07-22 16:22:11 +00:00
744c5e7658
add LXC version to docker info in debug mode
...
Upstream-commit: 921c6994b1ad41c940bdb08732225b8db74b68f2
Component: engine
2013-07-19 16:36:23 +00:00
c5cd9cfc76
Merge pull request #1211 from dotcloud/new_logs
...
*Runtime: Logs are now synchronised
Upstream-commit: 0bd534adcf0933d19540506f790d00d8d1cb23d4
Component: engine
2013-07-19 06:43:29 -07:00
37e3d486fa
add ps args to docker top
...
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
3427bb07af
documentation.
...
Upstream-commit: cd209f406e889feaba50103e5ce50f7dcd23767a
Component: engine
2013-07-18 14:22:49 -04:00
e1b72763dc
add debug and simplify docker logs
...
Upstream-commit: 1b0fd7ead33722d8782634d54cbd797f284aa085
Component: engine
2013-07-18 13:29:40 +00:00
9423c7f84d
add legacy support
...
Upstream-commit: a926cd4d880904258e01ea521ecd9e1b908f2b97
Component: engine
2013-07-18 13:25:47 +00:00
fb0bdc7ba8
prevent any kind of operation simultaneously
...
Upstream-commit: 2db99441c85fdf1e7d468bc02b085d9e1b95704c
Component: engine
2013-07-17 20:39:36 +00:00
7d6b6db98e
fix docker rmi via id
...
Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6
Component: engine
2013-07-17 15:48:53 +00:00
e7c82564d0
add server.ContainerTop, server.poolAdd and ser.poolRemove tests
...
Upstream-commit: fb005a3da813ba855b6597c146b66842846df3d8
Component: engine
2013-07-16 14:38:18 +00:00
80066854b8
store both logs in a same file, as JSON
...
Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b
Component: engine
2013-07-15 16:17:58 +00:00
51c31b8a66
*Client: Fix the progressbar, without manipulating other outputs
...
Prior this commit, 'docker images' and other cmd's, which used utils.HumanSize(),
showed unnecessary whitespaces.
Formatting of progress has been moved to FormatProgess(), justifing the string
directly in the template.
Upstream-commit: bac5772312d1fe733511febd117e9f29ff19c698
Component: engine
2013-07-12 20:15:25 +02:00
