Guillaume J. Charmes
0acdef4549
Merge pull request #1166 from dotcloud/networkless_tests-2
...
* Tests: Remove all network dependencies from the test suite
2013-07-09 11:20:18 -07:00
Guillaume J. Charmes
7d8ef90ccb
Merge pull request #1173 from dotcloud/1172-ghost_restart-fix
...
Make sure container is not marked as ghost when it starts
2013-07-09 10:49:17 -07:00
Guillaume J. Charmes
91520838fc
Make sure container is not marked as ghost when it starts
2013-07-09 10:48:33 -07:00
Guillaume J. Charmes
ada0e1fb08
Merge pull request #1049 from dotcloud/1040_ignore_stderr_tests-fix
...
- Tests: Ignore stderr while doing tests
2013-07-09 10:32:24 -07:00
Victor Vieux
72d278fdac
Merge pull request #1170 from dotcloud/fix_type_socket
...
Fix typo socket
2013-07-09 03:57:45 -07:00
Victor Vieux
05d7f85af9
fix typo
2013-07-09 10:55:28 +00:00
Solomon Hykes
7fba358ae2
Merge pull request #1013 from dotcloud/standardize-build
...
* Hack: standardized docker's build environment in a Dockerfile
2013-07-08 21:33:45 -07:00
Solomon Hykes
9f1fc40a64
* Hack: standardized docker's build environment in a Dockerfile
2013-07-08 21:30:29 -07:00
Guillaume J. Charmes
e14dd4d33e
Merge pull request #1157 from kstaken/1156-entrypoint-builder
...
Builder: Fix #1156 entrypoint override from base image
2013-07-08 16:57:26 -07:00
Kimbro Staken
87a69e6753
Merge branch '1156-entrypoint-builder' of github.com:kstaken/docker into 1156-entrypoint-builder
2013-07-08 16:06:09 -07:00
Kimbro Staken
f64dbdbe3a
Override Entrypoint picked up from the base image that breaks run commands in builder
2013-07-08 16:04:39 -07:00
Kimbro Staken
2b5553144a
Removing the save to disk as it was not really necessary
2013-07-08 16:03:18 -07:00
Guillaume J. Charmes
e43ef364cb
Remove all network dependencies from the test suite
2013-07-08 15:23:04 -07:00
Victor Vieux
90f372af5c
Merge pull request #1163 from dotcloud/1137-change_search_size-feature
...
* Client : uses the terminal size to display search output, add -notrunc
2013-07-08 11:47:25 -07:00
Victor Vieux
3ec29eb5da
Merge pull request #1066 from mhennings/fix-broken-streaming-result
...
* Server: Fix streaming status to the docker client while pushing images
2013-07-08 11:21:29 -07:00
Victor Vieux
3a20e4e15d
add if to prevent crash
2013-07-08 18:19:12 +00:00
Victor Vieux
fd97190ee7
uses the terminal size to display search output, add -notrunc and fix bug in resize
2013-07-08 17:20:13 +00:00
Victor Vieux
70480ce7bc
Merge pull request #1030 from dotcloud/builder_display_err_log
...
*Builder : Display containers logs in case of build failure
2013-07-08 07:26:46 -07:00
Victor Vieux
c059785ffb
Merge pull request #1161 from dotcloud/add_remote_addr_debug
...
Add remote addr in debug
2013-07-08 05:46:49 -07:00
Victor Vieux
a0f5fb7394
add remote addr in debug
2013-07-08 12:45:50 +00:00
Victor Vieux
ad33e9f388
Merge pull request #1138 from dotcloud/1123-rmi_conflict-fix
...
* Runtime: Fix error in rmi when conflict
2013-07-08 05:19:05 -07:00
Kimbro Staken
1d1d81b0bc
Cleanup white space
2013-07-08 00:18:47 -07:00
Kimbro Staken
f3d2969560
Override Entrypoint picked up from the base image that breaks run commands in builder
2013-07-08 00:11:45 -07:00
Sam Alba
e2b8ee2723
Fixed runtime_test (ImagePull prototyped changed)
2013-07-05 16:03:22 -07:00
Guillaume J. Charmes
07dc0a5120
Merge pull request #1144 from dotcloud/standalone_registry
...
* Registry: Standalone registry
2013-07-05 15:56:48 -07:00
Sam Alba
d3125d8570
Code cleaning
2013-07-05 15:26:08 -07:00
Sam Alba
283ebf3ff9
fmt.Errorf instead of errors.New
2013-07-05 14:56:56 -07:00
Sam Alba
4c174e0bfb
Fixed ping URL
2013-07-05 14:55:48 -07:00
Sam Alba
57a6c83547
Allowing namespaces in standalone registry
2013-07-05 14:30:43 -07:00
Sam Alba
cfc7684b7d
Restoring old changeset lost by previous merge
2013-07-05 12:37:07 -07:00
Sam Alba
be49f0a118
Merging from master
2013-07-05 12:27:10 -07:00
Sam Alba
66a9d06d9f
Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
2013-07-05 12:20:58 -07:00
Guillaume J. Charmes
6940cf1ecd
Merge pull request #1127 from cespare/patch-1
...
Typo fix
2013-07-05 10:48:59 -07:00
Guillaume J. Charmes
4e0cdc016a
Revert #1126 . Remove mount shm
2013-07-05 10:47:00 -07:00
Guillaume J. Charmes
8a8109648a
Merge pull request #1129 from cespare/style-fixes-2
...
Style fixes for fmt + err usage.
2013-07-05 10:31:53 -07:00
Guillaume J. Charmes
dc8b359319
Merge pull request #1126 from karanlyons/patch-1
...
* Runtime: Mount /dev/shm as a tmpfs.
2013-07-05 10:31:05 -07:00
Victor Vieux
dea29e7c99
Fix error in rmi when conflict
2013-07-05 16:58:39 +00:00
Daniel Mizyrycki
ab6379b3e0
Merge pull request #1133 from dotcloud/775-testing-notifications
...
testing, issue #775 : Add automatic testing notifications to docker-ci
2013-07-04 21:48:00 -07:00
Daniel Mizyrycki
f7fed2ea5f
testing, issue #775 : Add automatic testing notifications to docker-ci
2013-07-04 21:43:46 -07:00
Daniel Mizyrycki
35e87ee571
Merge pull request #1132 from dotcloud/776-testing-commit
...
testing, issue #776 : Ensure docker-ci test docker code as it was at commit time
2013-07-04 20:37:51 -07:00
Daniel Mizyrycki
ab3893ff4d
testing, issue #776 : Ensure docker-ci test docker code as it was at commit time
2013-07-04 20:28:54 -07:00
Caleb Spare
1277dca335
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().
2013-07-04 14:33:17 -07:00
Caleb Spare
ba9aef6f2c
Typo fix
...
Error message grammar tweak
2013-07-04 12:40:14 -07:00
Karan Lyons
dd619d2bd6
Mount /dev/shm as a tmpfs.
...
Fixes #1122 .
2013-07-04 09:58:50 -07:00
Marco Hennings
1e2ef274cd
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.
2013-07-04 10:50:37 +02:00
Guillaume J. Charmes
bcb5e36dd9
Merge pull request #1111 from cespare/style-fixes
...
Style fixes
2013-07-03 14:46:05 -07:00
Caleb Spare
19121c16d9
Implement several golint suggestions, including:
...
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
2013-07-03 14:36:04 -07:00
Caleb Spare
27ee261e60
Simplify the NopWriter code.
2013-07-03 14:35:18 -07:00
Caleb Spare
da3962266a
Gofmt -s (simplify)
2013-07-03 14:35:18 -07:00
Caleb Spare
e93afcdd2b
Use fmt.Errorf when appropriate.
2013-07-03 14:35:18 -07:00
