e2583b0738
Merge pull request #1170 from dotcloud/fix_type_socket
...
Fix typo socket
Upstream-commit: 72d278fdacf537d44a39244ade8ce03d02a00095
Component: engine
2013-07-09 03:57:45 -07:00
80e25aa274
fix typo
...
Upstream-commit: 05d7f85af9e5813ddb1c066e44c802dc33790547
Component: engine
2013-07-09 10:55:28 +00:00
fd7c117636
Merge pull request #1013 from dotcloud/standardize-build
...
* Hack: standardized docker's build environment in a Dockerfile
Upstream-commit: 7fba358ae2ba434bdd23da1bd46126ccdd23f749
Component: engine
2013-07-08 21:33:45 -07:00
f46f2cd5f6
* Hack: standardized docker's build environment in a Dockerfile
...
Upstream-commit: 9f1fc40a64fd6863dec5298099041493fee87db5
Component: engine
2013-07-08 21:30:29 -07:00
003e7619de
Fixed typo (thanks unit tests)
...
Upstream-commit: 3be7bc38e034c94da7cd6da5f2e5ecffd1832d6b
Component: engine
2013-07-08 17:42:18 -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
9d31c1c68b
It is now possible to include a ":" in a local repository name (it will not be the case for a remote name). This adds support for full qualified repository name in order to support private registry server
...
Upstream-commit: e7d36c9590bfdc2e57cbbecce87729f51ac3b35f
Component: engine
2013-07-08 17:22:41 -07:00
a1649836a4
Changed the tag parsing to it will work even if there is a port in the repos registry url (full qualified name for pushing on a standalone registry)
...
Upstream-commit: 3e8626c4a171653971aebcb778087c89c6c7ab67
Component: engine
2013-07-08 17:20:41 -07:00
7664005559
Merge pull request #1157 from kstaken/1156-entrypoint-builder
...
Builder: Fix #1156 entrypoint override from base image
Upstream-commit: e14dd4d33e2bbdb54f2bac31eb8eae155f9b656a
Component: engine
2013-07-08 16:57:26 -07:00
05fc4b9d83
Merge branch '1156-entrypoint-builder' of github.com:kstaken/docker into 1156-entrypoint-builder
...
Upstream-commit: 87a69e67530555468462985833282b84608e6ef6
Component: engine
2013-07-08 16:06:09 -07:00
f371bd9fe8
Override Entrypoint picked up from the base image that breaks run commands in builder
...
Upstream-commit: f64dbdbe3a147f58d04b6c39c6469fdd97427098
Component: engine
2013-07-08 16:04:39 -07:00
13025daedd
Removing the save to disk as it was not really necessary
...
Upstream-commit: 2b5553144a9249bbfed9be2a181b051a66350cb1
Component: engine
2013-07-08 16:03:18 -07:00
32424f76bf
Remove all network dependencies from the test suite
...
Upstream-commit: e43ef364cb99585d3285f51f7ab308f8a77fe09e
Component: engine
2013-07-08 15:23:04 -07:00
84dca8f32c
Fix #1162 - Remove bufio from Untar
...
Upstream-commit: 08a87d4b3b3f76ac9d73309b1042aa75d6634ed9
Component: engine
2013-07-08 13:42:17 -07:00
4770cb222d
Merge pull request #1163 from dotcloud/1137-change_search_size-feature
...
* Client : uses the terminal size to display search output, add -notrunc
Upstream-commit: 90f372af5c30fdefb7b579b5dc2f1ab743499909
Component: engine
2013-07-08 11:47:25 -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
92dc376485
add if to prevent crash
...
Upstream-commit: 3a20e4e15d27ab0061e5ffb427baf7162de9add9
Component: engine
2013-07-08 18:19:12 +00:00
5449f8eee9
uses the terminal size to display search output, add -notrunc and fix bug in resize
...
Upstream-commit: fd97190ee752c8de38be38a03f3cfdd4b4ce1460
Component: engine
2013-07-08 17:20:13 +00:00
ed7082a0e1
Merge pull request #1030 from dotcloud/builder_display_err_log
...
*Builder : Display containers logs in case of build failure
Upstream-commit: 70480ce7bc6991efd7fa917981940a0c1321eb17
Component: engine
2013-07-08 07:26:46 -07:00
d8be5aafec
rebase master
...
Upstream-commit: bf7d6cbb4af2e7176c66d2ad74515699b7898fea
Component: engine
2013-07-08 13:26:29 +00:00
cfdc3caf79
Merge pull request #1161 from dotcloud/add_remote_addr_debug
...
Add remote addr in debug
Upstream-commit: c059785ffb95f31ba52a45c4e8831121a22e7c43
Component: engine
2013-07-08 05:46:49 -07:00
db4a9e2ff1
add remote addr in debug
...
Upstream-commit: a0f5fb7394e6d1bf96865b8ec20796e682b4505b
Component: engine
2013-07-08 12:45:50 +00: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
1a5cae3fdb
Cleanup white space
...
Upstream-commit: 1d1d81b0bc52c6aff652f5515fd792f76e40f7c2
Component: engine
2013-07-08 00:18:47 -07:00
3ca4c119d1
Override Entrypoint picked up from the base image that breaks run commands in builder
...
Upstream-commit: f3d29695608d9ea9a3f92bcf872c62e158106919
Component: engine
2013-07-08 00:11:45 -07:00
76d4b40d44
Replaced gendered language in the README
...
Upstream-commit: 758ea61b77ab54403d2d3955b74b6c72cd96e2a5
Component: engine
2013-07-07 13:55:02 +10:00
cb3c028f8b
add websocket support to /container/<name>/attach/ws
...
This function add the possibility to attach containers streams to a
websocket. When a websocket is asked the request is upgraded to this
protocol..
Upstream-commit: 8eeff01939e3b9f09e5233f6cde60e1c10af0a63
Component: engine
2013-07-06 02:05:02 +02:00
dabdb2f88b
testing, issue #1104 : Make the test use static flags
...
Upstream-commit: 4388bef996063b3b69e738082b6820d3a979921e
Component: engine
2013-07-05 16:49:55 -07:00
203bc7383a
Fixed runtime_test (ImagePull prototyped changed)
...
Upstream-commit: e2b8ee2723a4cf6a37cdb455011ec447f23f8f49
Component: engine
2013-07-05 16:03:22 -07:00
a64e91af3a
Merge pull request #1144 from dotcloud/standalone_registry
...
* Registry: Standalone registry
Upstream-commit: 07dc0a51205b5dcfa5525acf15e1d500f201fa12
Component: engine
2013-07-05 15:56:48 -07:00
7ec374d04b
Code cleaning
...
Upstream-commit: d3125d8570de0f9c09de94c657f7e35755accdef
Component: engine
2013-07-05 15:26:08 -07:00
76ecb3f5a4
fmt.Errorf instead of errors.New
...
Upstream-commit: 283ebf3ff92ef552ae9cdf23a17c1a375dac99bd
Component: engine
2013-07-05 14:56:56 -07:00
fba3efb6e1
Fixed ping URL
...
Upstream-commit: 4c174e0bfb4c6e6333f39fff3c70058eaed37e3a
Component: engine
2013-07-05 14:55:48 -07:00
44c8a27b06
Allowing namespaces in standalone registry
...
Upstream-commit: 57a6c83547ba4671940c3134a3f68586db603048
Component: engine
2013-07-05 14:30:43 -07:00
5ee43e9d28
Restoring old changeset lost by previous merge
...
Upstream-commit: cfc7684b7de542cfed9d8b90b654fe59c8aa4098
Component: engine
2013-07-05 12:37:07 -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
00b3b197f8
Merge pull request #1127 from cespare/patch-1
...
Typo fix
Upstream-commit: 6940cf1ecd982e5087d614193e1e655383721c44
Component: engine
2013-07-05 10:48:59 -07:00
36c6877ea9
Revert #1126 . Remove mount shm
...
Upstream-commit: 4e0cdc016a5eb7227d4b8d7daffba7335fcbe749
Component: engine
2013-07-05 10:47:00 -07:00
c5f9d84a7d
Merge pull request #1129 from cespare/style-fixes-2
...
Style fixes for fmt + err usage.
Upstream-commit: 8a8109648a7b99acf6aff9336a39150f2c6e05a4
Component: engine
2013-07-05 10:31:53 -07:00
b40dc53b63
Merge pull request #1126 from karanlyons/patch-1
...
* Runtime: Mount /dev/shm as a tmpfs.
Upstream-commit: dc8b3593190625378c66a901fdcc1d962fc8fc87
Component: engine
2013-07-05 10:31:05 -07:00
5824d26e27
Fix error in rmi when conflict
...
Upstream-commit: dea29e7c999b7ef76a816867a2cb75c2da658fa2
Component: engine
2013-07-05 16:58:39 +00:00
efb2d72b4c
Merge pull request #1133 from dotcloud/775-testing-notifications
...
testing, issue #775 : Add automatic testing notifications to docker-ci
Upstream-commit: ab6379b3e0fb0a4de5e08a2f1dfd285c60452a51
Component: engine
2013-07-04 21:48:00 -07:00
0bad98719b
testing, issue #775 : Add automatic testing notifications to docker-ci
...
Upstream-commit: f7fed2ea5f811719bd8bd2e6111838ad50a53194
Component: engine
2013-07-04 21:43:46 -07:00
8f22c9d604
Merge pull request #1132 from dotcloud/776-testing-commit
...
testing, issue #776 : Ensure docker-ci test docker code as it was at commit time
Upstream-commit: 35e87ee5717fd042d9cd81ca113f2b27fcaf03f4
Component: engine
2013-07-04 20:37:51 -07:00
079055d521
testing, issue #776 : Ensure docker-ci test docker code as it was at commit time
...
Upstream-commit: ab3893ff4d202549bf79e5671cc9e6f18376cbfd
Component: engine
2013-07-04 20:28:54 -07: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
15bf500531
Typo fix
...
Error message grammar tweak
Upstream-commit: ba9aef6f2c529ccea571deacc46d2a61ca74a8bc
Component: engine
2013-07-04 12:40:14 -07:00
a0d0d12548
Mount /dev/shm as a tmpfs.
...
Fixes #1122 .
Upstream-commit: dd619d2bd6a3cf621106f2599fbf3bc903b5801a
Component: engine
2013-07-04 09:58:50 -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
