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
Sam Alba
d3125d8570
Code cleaning
2013-07-05 15:26:08 -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
Victor Vieux
dea29e7c99
Fix error in rmi when conflict
2013-07-05 16:58:39 +00: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
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
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
Guillaume J. Charmes
96bc9ea7c1
Merge pull request #1112 from cespare/mutex-style
...
Mutex style change.
2013-07-03 10:34:32 -07:00
Caleb Spare
1cf9c80e97
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).
2013-07-02 15:53:08 -07:00
Tobias Schwab
9632cf09bf
fix two obvious bugs???
2013-07-02 22:11:03 +00:00
shin-
7cc294e777
When no tag is specified in docker pull, skip images that are not tagged
2013-07-02 18:25:06 +02:00
Victor Vieux
11e28842ac
change to top
2013-07-01 15:19:42 +00:00
Victor Vieux
5e029f7600
Merge pull request #1061 from proppy/fix-slices-ref
...
api,server: slice are already refs, no need to return ptr
2013-07-01 04:51:56 -07:00
Johan Euphrosine
54da339b2c
api,server: slice are already refs, no need to return ptr
2013-06-28 12:41:09 -07:00
Sam Alba
ac37fcf6f3
Fixed conflicts
2013-06-28 12:36:59 -07:00
Sam Alba
893c974b08
Resolve conflict
2013-06-28 12:32:41 -07:00
shin-
ad2f826a82
go fmt pass
2013-06-28 18:19:58 +02:00
shin-
c3dd6e1926
Several fixes and updates to make this work with latest changes in master
2013-06-28 18:19:58 +02:00
Guillaume J. Charmes
67ecd2cb82
Reenable writeflusher for pull
2013-06-28 18:19:58 +02:00
Guillaume J. Charmes
57d751c377
Remove https prefix from registry
2013-06-28 18:19:58 +02:00
shin-
2a1f8f6fda
Ignore 'registry not found' when pushing on independent registries
2013-06-28 18:19:58 +02:00
shin-
de0a48bd6f
Tentative support for independent registries
2013-06-28 18:19:58 +02:00
Victor Vieux
2e79719622
add /proc to list running processes inside a container
2013-06-28 15:51:58 +00:00
Sam Alba
3175e56ad0
URL schemes of both Registry and Index are now consistent
2013-06-27 17:55:17 -07:00
Gabriel Monroy
4fdf11b2e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
2013-06-26 15:07:31 -07:00
Victor Vieux
862e223cec
Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
2013-06-25 13:33:45 +00:00
Victor Vieux
4d1692726b
merge master and add doc
2013-06-22 01:08:20 +02:00
Guillaume J. Charmes
b419699ab8
Use hijack for logs instead of stream
2013-06-20 18:18:36 -07:00
Eric Myhre
e44f62a95c
Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
2013-06-20 16:29:54 -05:00
Guillaume J. Charmes
21a5a6202d
Merge pull request #907 from dotcloud/go1.1_cookie_jar-feature
...
* Runtime: use go 1.1 cookiejar and remove ResetClient
2013-06-20 10:48:36 -07:00
Victor Vieux
1c841d4fee
add warning when you rm a running container
2013-06-20 15:45:30 +00:00
Victor Vieux
bd04d7d475
add ps -s
2013-06-20 14:19:50 +00:00
Victor Vieux
5f93aa0ecf
rebase master
2013-06-20 13:56:36 +00:00
Solomon Hykes
8a131dffb6
Merge pull request #948 from dotcloud/registry_pathencode
...
* Registry: Use opaque requests when we need to preserve urlencoding in registry requests
2013-06-19 22:41:16 -07:00
Guillaume J. Charmes
7e065aaacd
Merge pull request #917 from dotcloud/pull_pool
...
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
2013-06-19 14:11:29 -07:00
shin-
0312bbc535
Use opaque requests when we need to preserve urlencoding in registry requests
2013-06-19 13:49:45 -07:00
Victor Vieux
ec3c89e57c
Merge pull request #849 from dotcloud/improve_progressbar_pull
...
* Client: HumanReadable ProgressBar sizes in pull
2013-06-19 08:02:40 -07:00
Guillaume J. Charmes
0a9ac63a05
Merge pull request #916 from dotcloud/race_attach-fix
...
- Runtime: Fix race condition within Run command when attaching.
2013-06-18 17:13:38 -07:00
Guillaume J. Charmes
808faa6371
* API: Send all tags on History API call
2013-06-18 10:31:07 -07:00
Guillaume J. Charmes
3bfc822578
* API: Add tag lookup to history command. Fixes #882
2013-06-17 18:39:30 -07:00
Guillaume J. Charmes
fe204e6f48
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
2013-06-17 16:10:00 -07:00
Guillaume J. Charmes
c106ed32ea
Move the attach prevention from server to client
2013-06-17 15:40:04 -07:00
Victor Vieux
fde82f448f
use go 1.1 cookiejar and revome ResetClient
2013-06-17 18:13:40 +00:00
Solomon Hykes
17235eb089
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-06-14 15:07:05 -07:00
Solomon Hykes
250e47e2eb
Merge branch 'dns_server_side'
...
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
2013-06-14 14:39:05 -07:00
Guillaume J. Charmes
813771e6b7
Merge pull request #892 from unclejack/validate_memory_limits
...
* Runtime: validate memory limits & error out if it's less than 524288
2013-06-14 14:32:28 -07:00
Guillaume J. Charmes
60fd7d686d
Merge branch 'master' into improve_progressbar_pull
2013-06-14 12:01:40 -07:00
Solomon Hykes
c701de939f
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-06-14 11:58:46 -07:00
Guillaume J. Charmes
78e4a385f7
Merge branch 'master' into postupload-endpoints-header
...
Conflicts:
server.go
2013-06-14 11:50:58 -07:00
