Commit Graph

106 Commits

Author SHA1 Message Date
74373c4d59 Update utils_test.go
Upstream-commit: dcf9dfb12961fc8101624af0b925d026fde4cde1
Component: engine
2013-08-05 16:32:25 -07:00
d457571635 rebase master
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
c5da071b25 Merge pull request #1382 from monnand/650-http-utils
650 http utils and user agent field
Upstream-commit: feda3db1dd1c76d2866c2a628e28a4999b5b88da
Component: engine
2013-08-05 08:49:12 -07:00
37bc41c2c0 Merge pull request #1389 from dotcloud/1373-improve_checklocaldns
Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 030cc8d5cc2df5a8f8f6acb3724c1e6016363d95
Component: engine
2013-08-05 02:29:36 -07:00
6b62e3168d Merge pull request #1298 from crosbymichael/1246-auth-request
* Registry: Do not require login unless 401 is received on push
Upstream-commit: 4dcc0f316c6dbcad3932b483ad0946a4b7d526cc
Component: engine
2013-08-02 17:39:54 -07:00
3029f070e6 Return JSONError for HTTPResponse error
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
2013-08-03 00:27:58 +00:00
71b5dff299 Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
2013-08-02 15:23:36 -07:00
d99bd7febd Merge pull request #1117 from dotcloud/add_last_version-feature
Add last stable version in `docker version`
Upstream-commit: ffcba1236c3ba743b8920c6bf559fe2aa55daf25
Component: engine
2013-08-02 13:53:33 -07:00
4e4b48bb11 Server now use request factory
Upstream-commit: 6a56b7b391ac967540915c2ee8f82b23714ad84c
Component: engine
2013-08-02 03:23:46 -04:00
f137da22a4 http utils
Upstream-commit: 793fd983ef937d2bea1edf5d8d855e2a452a4aa7
Component: engine
2013-08-02 02:47:58 -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
7aa4663949 Return registy status code in error
Added Details map to the JSONMessage
Upstream-commit: 3043c2641990d94298c6377b7ef14709263a4709
Component: engine
2013-07-30 23:24:31 +00:00
60591c4d11 rebase master
Upstream-commit: 6166380d76ad49b0a077569466b29b5352df9105
Component: engine
2013-07-30 16:51:50 +00:00
c7d245ec6d Add check that the request is good
Upstream-commit: e4752c8c1a09fc3cc96dbb9be7183b271db3d6b7
Component: engine
2013-07-30 16:42:32 +00:00
ccc9b252b2 Merge branch 'master' into add_last_version-feature
Upstream-commit: 99c27fa0ddf6db7eb8a1b9484ea6ad19c0b2e4f5
Component: engine
2013-07-30 16:23:06 +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
0e6bb26f77 Switch json/payload order
Upstream-commit: 394941b6b0a30fecf8ae7b6de5880fa553141f93
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
77e59c2148 add ParseRepositoryTag tests
Upstream-commit: 3852d0599097581d5dc0bcfcb7aa010d564beb9a
Component: engine
2013-07-29 12:16:01 +00:00
7c51899dd5 Fixes 1136; Reopened from 1175 with latest changes.
Upstream-commit: d86898b0142f2f9a834aa0c727b10d62ef647262
Component: engine
2013-07-25 19:45:49 +00:00
1a3ff090dc fix errors
Upstream-commit: 01e98bf0dd26a1de7fd280fd4b0f0a79aedd0cdd
Component: engine
2013-07-25 14:32:46 +00:00
ce008bc612 Use VT100 escape codes
:
Upstream-commit: f1dd299227b15696872822f40a4ab9f1a54098a7
Component: engine
2013-07-25 14:16:36 +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
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
f380201be8 fix error in utils tests
Upstream-commit: 2e3b660dd0d49dc78f4c486e952ea6db9c007d6a
Component: engine
2013-07-19 13:56:36 +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
0089cd0195 Merge branch 'master' into add_last_version-feature
Upstream-commit: 39ff542142e61dd9041925ad95fbac23be307414
Component: engine
2013-07-18 20:51:31 +00:00
ef03a6ab8c Hotfix: make sure ./utils tests pass
Upstream-commit: 1004d57b85fc3714b089da4c457228690f254504
Component: engine
2013-07-15 17:58:23 -07:00
ff7fe2dacd Merge pull request #1096 from dotcloud/remove_os_user
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
Upstream-commit: 454cd147fb6133319ecdcda962b6aa137f28f32a
Component: engine
2013-07-15 10:19:09 -07:00
08204dd54e Add unit test to check wrong uid case
Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e
Component: engine
2013-07-15 10:05:09 -07:00
80066854b8 store both logs in a same file, as JSON
Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b
Component: engine
2013-07-15 16:17:58 +00:00
cb4f99ad54 Merge branch 'master' into new_logs
Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0
Component: engine
2013-07-15 13:57:54 +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
23db3e215b Revert "Client: better progressbar output"
This reverts commit 3ac68f1966222d9a1c0ff867515e3f5c2f83e422.
Upstream-commit: a6e5a397bd6b7967a91f1d7cbe581e46211964da
Component: engine
2013-07-12 20:08:45 +02:00
014efc77a7 Remove the os.user dependency and manually lookup /etc/passwd instead
Upstream-commit: eb38750d99d4f9706cb2abcb861c84e1d309bd40
Component: engine
2013-07-12 10:49:47 -07:00
18c42253ef use http://get.docker.io/latest
Upstream-commit: e9011122fbc4c65afe235a75ca8197ce4fd23753
Component: engine
2013-07-12 11:45:40 +00:00
750c01d0af wip
Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56
Component: engine
2013-07-11 17:18:28 +00:00
13a18e3d5d Moved parseRepositoryTag to the utils package
Upstream-commit: 019324015b0c64733ae4f39708aa49a08134cb48
Component: engine
2013-07-09 08:06:10 -07:00
36eac88873 Simplify the NopWriter code.
Upstream-commit: 27ee261e6048c6fa0334bcce2116610dcd04aaed
Component: engine
2013-07-03 14:35:18 -07:00
2394c9c8dc add last version
Upstream-commit: 64450ae3f89b8f9b5288224c5a7d109a166cf22a
Component: engine
2013-07-03 17:11:00 +00:00
8f5746f4d9 Mutex style change.
For structs protected by a single mutex, embed the mutex for more
concise usage.

Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
2013-07-02 15:53:08 -07:00
2be0a9146e Resolve conflict
Upstream-commit: 893c974b08b8859a4d6d3d7d38d9c21c9b6472c3
Component: engine
2013-06-28 12:32:41 -07:00
ad4f82e6d2 Merge pull request #1032 from andrewsmedina/govet
following the 'go vet' suggestions for the docker package.
Upstream-commit: a11fc9f067d898e3dd6a43e9841e2ea85842af2b
Component: engine
2013-06-28 05:27:53 -07:00
c26a152aeb remove + from minor kernel version
Upstream-commit: 5ed4386bbf869caf6d39f619e27c5ee1310f879d
Component: engine
2013-06-27 17:51:17 +03:00
d68f44e101 following 'go vet' in utils pkg.
Upstream-commit: 6cf493bea74e9caa05e1da9e970c47d1f24268d8
Component: engine
2013-06-27 01:40:13 -03:00