Commit Graph

198 Commits

Author SHA1 Message Date
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
eac2c76be1 Merge pull request #1268 from dotcloud/refactor_checksum
Refactor checksum
Upstream-commit: bcd6ca368556c329063d58c32945753f783adc75
Component: engine
2013-07-30 06:07:54 -07: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
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
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
7d6b6db98e fix docker rmi via id
Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6
Component: engine
2013-07-17 15:48:53 +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
c22c23bfc2 Merge branch 'master' into list_container_processes-feature
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
5042ef8b4a added client's kernel version
Upstream-commit: d40efc4648af6bb5c60b37a789effd602af1f132
Component: engine
2013-07-10 18:56:49 -04:00
addc24cbb8 Insert version checkers when call NewRegistry()
Upstream-commit: 5705a493080ba5571a7929d37e7926678a982cb4
Component: engine
2013-07-10 18:56:49 -04:00
d233f1b215 added APIVersion when call NewRegistry
Upstream-commit: 65185a565b8e05a2dd58e10d1c1ad560f4a255cf
Component: engine
2013-07-10 18:53:38 -04:00
916139ebc6 Fixed potential security issue (never try http on official index when polling the endpoint). Also fixed local repos name when pulling index.docker.io/foo/bar
Upstream-commit: f44eac49fae1b33e6ff4c6f42c5e7305caf22252
Component: engine
2013-07-09 11:30:12 -07:00
e5ac013477 Re-implemented a notion of local and private repos. This allows to consider the full qualified name of the repos as the name for the local repository without breaking the calls to the Registry API.
Upstream-commit: 31c66d5a00ee693a31902d1f75777dc9507c1416
Component: engine
2013-07-08 17:26:50 -07:00
20f80da2d4 Merge pull request #1066 from mhennings/fix-broken-streaming-result
* Server: Fix streaming status to the docker client while pushing images
Upstream-commit: 3ec29eb5dae98ce654bc18f5fada6c98f28872f5
Component: engine
2013-07-08 11:21:29 -07:00
cacdb75159 Merge pull request #1138 from dotcloud/1123-rmi_conflict-fix
* Runtime: Fix error in rmi when conflict
Upstream-commit: ad33e9f38866fa4f5c62d9974d96ee1b324ea5dc
Component: engine
2013-07-08 05:19:05 -07:00
7ec374d04b Code cleaning
Upstream-commit: d3125d8570de0f9c09de94c657f7e35755accdef
Component: engine
2013-07-05 15:26:08 -07:00
bf4fc24d05 Merging from master
Upstream-commit: be49f0a1182164d0d279484ec35931c1e3ef6d3c
Component: engine
2013-07-05 12:27:10 -07:00
057f0a4b6f Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
Upstream-commit: 66a9d06d9fa7a382c6852cf047e1448e0d3e1782
Component: engine
2013-07-05 12:20:58 -07:00
5824d26e27 Fix error in rmi when conflict
Upstream-commit: dea29e7c999b7ef76a816867a2cb75c2da658fa2
Component: engine
2013-07-05 16:58:39 +00:00
2eb55531d3 Style fixes for fmt + err usage.
fmt.Printf and friends will automatically format using the error
interface (.Error()) preferentially; no need to do err.Error().
Upstream-commit: 1277dca3358874d0701685f7ebb52ce66be1b385
Component: engine
2013-07-04 14:33:17 -07:00
553b7563ec Pushing an Image causes the docker client to give an error message instead of
writing out streamed status.

This is caused by a Buffering message that is not in the correct json format:

[...]
{"status"
:"Pushing 6bba11a28f1ca247de9a47071355ce5923a45b8fea3182389f992f4
24b93edae"}Buffering to disk 244/? (n/a)..
{"status":"Pushing",[...]

The "Buffering to disk" message is originated in
srv.runtime.graph.TempLayerArchive

I am now using the StreamFormatter provided by the context from which the
method is called.
Upstream-commit: 1e2ef274cdaa76e79435df52cdc196739ba8b3b1
Component: engine
2013-07-04 10:50:37 +02:00
1c71d0a65e Implement several golint suggestions, including:
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
2013-07-03 14:36:04 -07:00
e37fa79f37 Merge pull request #1112 from cespare/mutex-style
Mutex style change.
Upstream-commit: 96bc9ea7c113127673e6e47a0366311e1edb8f1a
Component: engine
2013-07-03 10:34:32 -07:00