Xiuming Chen
0013aa7d9f
Minor code simplification for Containers api
2013-11-13 01:29:00 -08:00
Liang-Chi Hsieh
1d7f22c0d4
use Binds key in hostConfig to detect volumes mounted from external.
2013-11-13 15:08:46 +08:00
Liang-Chi Hsieh
6a693176d6
skip the volumes mounted when deleting the volumes of container.
2013-11-13 14:58:24 +08:00
Solomon Hykes
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
Michael Crosby
7301fbe035
Pull parent layers first before children
2013-11-12 11:48:35 -08:00
Victor Vieux
637850063c
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
2013-11-12 11:01:51 -08:00
Victor Vieux
b314f19db8
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
2013-11-12 10:19:29 -08:00
Victor Vieux
87c8437a90
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
2013-11-11 13:06:19 -08:00
Victor Vieux
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
Mark Allen
62f873aa1f
Just return the id; nothing else.
2013-11-11 13:26:24 -06:00
Mark Allen
8cc19765b4
Edits after code review
...
Return long image ID
Return streamformatted error or "raw" error
2013-11-10 00:06:55 -06:00
Sven Dowideit
b3974abe4f
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
2013-11-09 12:16:49 +10:00
Victor Vieux
45c2b5dc1a
prevent deletion if image is used by a running container
2013-11-08 15:01:01 -08:00
David Sissitka
5957dd9091
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
2013-11-08 00:15:19 -06:00
Solomon Hykes
9ae4bcaaf8
Move Change to the archive package, and fix a leftover merge in
...
Container.Inject()
2013-11-08 00:45:07 +00:00
Solomon Hykes
f1127b9308
gofmt
2013-11-07 23:58:03 +00:00
Solomon Hykes
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
Solomon Hykes
f2bab1557c
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
2013-11-07 22:38:50 +00:00
Nate Jones
8f64759881
bring back /images/viz, but 404 for latest
2013-11-06 03:58:15 +00:00
Nate Jones
2a5998baf1
move "images -viz" to client
2013-11-06 03:58:15 +00:00
Nate Jones
dcf0279a50
fix "images -a"
2013-11-06 03:58:15 +00:00
Nate Jones
15867ff430
rework images JSON
2013-11-06 03:58:15 +00:00
Solomon Hykes
8d6df3a7e2
Remove debug messages
2013-11-05 23:00:20 +00:00
Solomon Hykes
e5f8ab6160
Engine: 'create' creates a container and prints its ID on stdout
2013-11-05 23:00:20 +00:00
Solomon Hykes
d3f074494a
Better error reporting in engine logs and unit tests
2013-11-05 23:00:20 +00:00
unclejack
4d2ba779e1
validate bind mounts on the server side
...
This changes the server side code to make sure that:
1) the source of a bind mount isn't /
The bind mount "/:/foo" isn't allowed.
2) Check that the source exists
The source to be bind mounted must exist.
This fixes issue #2070 .
2013-11-05 22:54:24 +02:00
Solomon Hykes
02ddaad5d9
Engine: optional environment variable 'Logging' in 'serveapi'
2013-11-05 18:39:59 +00:00
Solomon Hykes
847411a1ee
Engine: fix a bug which caused handlers to be shared between multiple engine instances
2013-11-05 18:39:59 +00:00
Solomon Hykes
7b17d55599
httpapi: don't create a pidfile if it isn't set in the configuration
2013-11-05 18:39:59 +00:00
Solomon Hykes
958b4a8757
Engine: 'start' starts the specified container
2013-11-05 18:39:59 +00:00
Solomon Hykes
433c8e9c7d
Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
2013-11-05 17:41:37 +00:00
Victor Vieux
c5d4459a02
Merge pull request #2502 from hamo/unlink_err_v4
...
rewrite protocol check with switch-case in Server.Daemon
2013-11-04 17:46:46 -08:00
Victor Vieux
a482bfd715
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
2013-11-04 16:14:14 -08:00
Michael Crosby
a9ed238bb7
Ensure container name on register
2013-11-04 09:28:40 -08:00
Victor Vieux
8f27e23b4b
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
2013-11-01 15:21:47 -07:00
Jérôme Petazzoni
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
Victor Vieux
02b5202432
update docker search to reflect future changes of the api
2013-10-31 19:14:11 -07:00
Yang Bai
7848007c3a
rewrite protocol check with switch-case in Server.Daemon
2013-11-01 09:42:44 +08:00
Michael Crosby
96d1e9bb5a
Move archive.go to sub package
2013-10-31 16:57:45 -07:00
Victor Vieux
e3c49843d7
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
2013-10-31 16:32:49 -07:00
Travis Cline
1099d172a2
Add flags to history, add size flag
2013-10-30 19:41:20 -05:00
Victor Vieux
1c7ca51f32
fix typos
2013-10-30 13:18:48 -07:00
Victor Vieux
3362aaa4df
fix remove root name and fix error messages
2013-10-30 11:45:11 -07:00
Victor Vieux
fb4672c52c
do not split last column docker top
2013-10-29 19:03:41 -07:00
Michael Crosby
7e8b2c3836
Make sure only links are removed and not names
2013-10-28 19:19:31 -07:00
Michael Crosby
0d2924408b
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
2013-10-28 18:09:08 -07:00
Solomon Hykes
464ded79fc
Close sqlite persistent connection on SIGINT, SITERM or SIGKILL
2013-10-26 14:28:53 -07:00
Solomon Hykes
c1ae1a0e1c
Setup daemon pidfile/cleanup in Server.Daemon() instead of main()
2013-10-26 14:26:07 -07:00
Solomon Hykes
c542b2f873
Rename ConfigGetenv to ConfigFromJob
2013-10-26 14:24:25 -07:00
Solomon Hykes
7e691e11b0
Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
2013-10-26 14:24:13 -07:00
Solomon Hykes
1b8eef4efb
Engine: centralize checks for supported architectures and kernel versions
2013-10-26 14:21:04 -07:00
Solomon Hykes
0d1a825137
Minimal, unintrusive implementation of a cleaner Job API.
...
* Implement a new package: engine. It exposes a useful but minimalist job API.
* Refactor main() to instanciate an Engine instead of a Server directly.
* Refactor server.go to register an engine job.
This is the smallest possible refactor which can include the new Engine design
into master. More gradual refactoring will follow.
2013-10-26 14:18:13 -07:00
Victor Vieux
516cf54843
prevent default name to be deleted and return an error on invalid link
2013-10-25 16:49:49 -07:00
Michael Crosby
7c08aeeba4
Use persistent connection for links database
...
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
2013-10-25 15:13:25 -07:00
Victor Vieux
89fb51f606
fix merge issue and gofmt
2013-10-25 15:13:25 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Victor Vieux
93810b289c
fix wrong untag while docker rmi
2013-10-21 17:03:32 -07:00
Guillaume J. Charmes
333bc23f21
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
2013-10-18 16:19:27 -07:00
Guillaume J. Charmes
4918769b1a
Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
...
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
2013-10-18 16:16:29 -07:00
Karl Grzeszczak
ad723bbfe7
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
2013-10-11 08:04:40 -05:00
Victor Vieux
1daf242c8b
fix rm -v
2013-10-08 16:35:47 +00:00
Guillaume J. Charmes
f435970695
Merge pull request #1842 from dotcloud/split_stdout_stderr
...
* Runtime: Split stdout stderr
2013-09-26 18:05:24 -07:00
Guillaume J. Charmes
cb18a6e1b9
Update docs + fix endian issue
2013-09-26 17:36:21 -07:00
Guillaume J. Charmes
e854b7b2e6
Make StdCopy works with huge amount of data
2013-09-11 14:49:33 -07:00
Guillaume J. Charmes
8ae5348a51
Split stdout stderr for non-tty commands
2013-09-11 14:48:22 -07:00
shin-
c6dc90ccb9
Fixed push bug
2013-09-11 19:39:33 +02:00
Michael Crosby
ad152efbed
Merge pull request #1759 from bdon/graph-map
...
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
2013-09-10 08:49:11 -07:00
Victor Vieux
2801624462
Merge pull request #1796 from shin-/api_1_5
...
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information
2013-09-09 16:58:54 -07:00
Victor Vieux
843f9091f2
Merge branch 'filter' of https://github.com/reds/docker into reds-filter
2013-09-09 22:16:16 +00:00
Solomon Hykes
e503f6a878
Merge pull request #1825 from dotcloud/merge-builder-runtime
...
Refactor to merge builder.go into runtime.go
2013-09-09 15:11:41 -07:00
shin-
64bc08f1c4
Push tags to registry even if images are already uploaded
2013-09-09 21:02:37 +02:00
Solomon Hykes
24e02043a2
Merge builder.go into runtime.go
2013-09-06 17:33:05 -07:00
Martin Redmond
b44d113120
filter image listing using path.Match
2013-09-06 16:16:10 -04:00
Martin Redmond
35bcba8011
improve image listing
2013-09-06 15:51:49 -04:00
shin-
98a1314251
Merge branch 'mhennings-1357-implement-login-with-private-registry' into api_1_5
2013-09-04 22:27:04 +02:00
shin-
b3a70d767d
Compute dependency graph and upload layers in the right order when pushing
2013-09-04 02:21:40 +02:00
Marco Hennings
fcee6056dc
Login against private registry
...
To improve the use of docker with a private registry the login
command is extended with a parameter for the server address.
While implementing i noticed that two problems hindered authentication to a
private registry:
1. the resolve of the authentication did not match during push
because the looked up key was for example localhost:8080 but
the stored one would have been https://localhost:8080
Besides The lookup needs to still work if the https->http fallback
is used
2. During pull of an image no authentication is sent, which
means all repositories are expected to be private.
These points are fixed now. The changes are implemented in
a way to be compatible to existing behavior both in the
API as also with the private registry.
Update:
- login does not require the full url any more, you can login
to the repository prefix:
example:
docker logon localhost:8080
Fixed corner corner cases:
- When login is done during pull and push the registry endpoint is used and
not the central index
- When Remote sends a 401 during pull, it is now correctly delegating to
CmdLogin
- After a Login is done pull and push are using the newly entered login data,
and not the previous ones. This one seems to be also broken in master, too.
- Auth config is now transfered in a parameter instead of the body when
/images/create is called.
2013-09-03 20:45:49 +02:00
Brandon Liu
1fca99ad90
Replace Graph.All with Graph.Map
2013-08-31 20:44:42 -07:00
shin-
98018df078
More descriptive, easier to process container portmappings information in the API
2013-08-28 00:20:35 +02:00
shin-
093b85b72f
Use additional decorator in RequestFactory to pass meta headers to registry
2013-08-22 21:15:31 +02:00
Marco Hennings
3f802f4a13
Fix race conditions in parallel pull
...
During parallel pull of a repostiory it can happen that the same layer
is pulled more than once.
To fix this I have extended the locking code to
- avoid multiple pulls of the same image
- avoid multiple pulls of the same layer
If an error occurs the other layers are awaited before returning as leaving
the scope before the go routines leave causes crashes of the server sometimes
if the download status is updated while the http stream is already closed
Beside this I have extended status display.
2013-08-22 13:23:43 +02:00
Michael Crosby
56e02dd0c7
Merge pull request #1588 from dotcloud/1561_fix_warning_in_tests
...
assume ip_forwarding = 1 by default
2013-08-21 09:15:23 -07:00
Michael Crosby
04c16f347b
Merge pull request #1396 from calavera/985-ordered-api-images
...
Sort APIImages by most recent creation date.
2013-08-19 09:41:39 -07:00
Victor Vieux
b21f898620
assume ip_forwarding = 1 by default
2013-08-19 12:34:30 +00:00
David Calavera
e6affb1b1a
Sort images by tag name when the creation date is the same.
...
This establishes a strict alphabetical order for tags with the same creation date.
2013-08-17 22:11:34 -07:00
Evan Phoenix
07a887032a
Show tag used when image is missing
2013-08-17 20:03:54 -07:00
Michael Crosby
15bc2240ac
Merge pull request #1505 from dotcloud/improve_events
...
Add image name in /events
2013-08-14 15:40:36 -07:00
Victor Vieux
c84d74df8c
add missing ParseRepositoryTag
2013-08-14 16:59:21 +00:00
Pascal Borreli
9b2a5964fc
Fixed typos
2013-08-12 18:53:06 +01:00
Victor Vieux
703905d7ec
ensure the use oh IDs and add image's name in /events
2013-08-12 11:50:03 +00:00
Victor Vieux
213365c2d2
fix docker build and docker events output
2013-08-08 22:51:39 +00:00
Victor Vieux
be77ee33bc
Merge branch 'master' into add_some_tests
2013-08-08 14:44:56 +00:00
Guillaume J. Charmes
6249cc3373
Merge pull request #1425 from dotcloud/simplify_ProgressReader
...
- Runtime: fix small \n error un docker build
2013-08-07 16:19:42 -07:00
Colin Rice
10190be5d7
Add warning when net.ipv4.ip_forwarding = 0
...
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
2013-08-07 18:28:39 -04:00
Guillaume J. Charmes
65a4e30825
Merge pull request #1093 from monnand/910-login-info
...
* Runtime: fixed #910 . print user name to docker info output
2013-08-07 15:09:55 -07:00
Michael Crosby
5b8cfbe15c
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
2013-08-06 16:09:54 +00:00
Victor Vieux
ba17f4a06a
fix small \n error un docker build
2013-08-06 14:31:51 +00:00
Nan Monnand Deng
303490168f
Added index address into APIInfo.
2013-08-05 23:36:55 -04:00
Victor Vieux
946bbee39a
rebase master
2013-08-05 16:25:42 +00:00
David Calavera
cd6aeaf979
Sort APIImages by most recent creation date.
...
Fixes #985 .
2013-08-03 15:35:36 -07:00
Nan Monnand Deng
5bc344ab73
factory generated from one place.
2013-08-02 04:10:26 -04:00
Nan Monnand Deng
4bd287e107
auth with user agent
2013-08-02 03:30:45 -04:00
Nan Monnand Deng
6a56b7b391
Server now use request factory
2013-08-02 03:23:46 -04:00
Victor Vieux
0c0077ed6f
Merge pull request #1328 from dotcloud/1307_url_port_delete-fix
...
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
2013-07-31 07:55:06 -07:00
Victor Vieux
6166380d76
rebase master
2013-07-30 16:51:50 +00:00
Victor Vieux
bcd6ca3685
Merge pull request #1268 from dotcloud/refactor_checksum
...
Refactor checksum
2013-07-30 06:07:54 -07:00
Victor Vieux
46f59dd933
add parallel pull to 1.4
2013-07-30 12:15:33 +00:00
Victor Vieux
e1fa989ec9
rebase master
2013-07-30 11:59:31 +00:00
Victor Vieux
0b57e4483a
Merge branch 'master' into 1237-improve_docker_top-feature
2013-07-30 11:51:16 +00:00
Guillaume J. Charmes
5b27652ac6
Make sure the index also receives the checksums
2013-07-29 11:30:21 -07:00
Guillaume J. Charmes
0f134b4bf8
Remove unused parameter
2013-07-29 11:30:17 -07:00
Guillaume J. Charmes
0badda9f15
Refactor the image size storage
2013-07-29 11:30:17 -07:00
Guillaume J. Charmes
e3f68b22d8
Handle extra-paremeter within checksum calculations
2013-07-29 11:30:17 -07:00
Guillaume J. Charmes
8ca7b0646e
Refactor checksum
2013-07-29 11:30:17 -07:00
Victor Vieux
63876e7dbd
use ParseRepositoryTag instead on split on : in imagedelete
2013-07-29 12:15:27 +00:00
Victor Vieux
e592f1b298
add regression test
2013-07-26 10:30:36 +00:00
Victor Vieux
e608296bc6
fix wrong untag when using rmi via id
2013-07-26 09:19:26 +00:00
Victor Vieux
8742649aa7
improve client output
2013-07-24 17:10:59 +00:00
Victor Vieux
0e71e368a8
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
2013-07-24 15:41:34 +00:00
Victor Vieux
dfc076a123
Merge pull request #1243 from dotcloud/add_lxc_version_docker_info
...
*Client: LXC and Kernel version to docker info in debug mode
2013-07-24 07:44:23 -07:00
Victor Vieux
066873ebd2
rebase master
2013-07-24 14:38:40 +00:00
Victor Vieux
f6e1055727
Merge pull request #1064 from monnand/156-user-agent-header
...
Add user agent when calling the registry
2013-07-24 06:40:53 -07:00
Victor Vieux
6057e6ad70
add kernel version
2013-07-24 13:36:55 +00:00
Victor Vieux
ca39f15fa3
bump master
2013-07-24 13:28:01 +00:00
Nan Monnand Deng
1ae54707a0
versionCheckers()->versionInfos().
2013-07-23 17:17:31 -04:00
Nan Monnand Deng
ede1e6d475
Rename: VersionChecker->VersionInfo.
2013-07-23 17:05:13 -04:00
Victor Vieux
040c3b50d0
use non-blocking channel to prevent dead-lock and add test for server
2013-07-23 15:42:34 +00:00
Victor Vieux
2e4d4c9f60
add since for polling, rename some vars
2013-07-23 15:41:19 +00:00
Victor Vieux
b8d52ec266
add timestamp and change untagged -> untag
2013-07-23 15:41:19 +00:00
Victor Vieux
b5da816487
basic version of the /events endpoint
2013-07-23 15:41:19 +00:00
Victor Vieux
c81662eae4
Merge branch 'master' into 1237-improve_docker_top-feature
...
Conflicts:
docs/sources/api/docker_remote_api.rst
2013-07-22 16:22:11 +00:00
Victor Vieux
921c6994b1
add LXC version to docker info in debug mode
2013-07-19 16:36:23 +00:00
Victor Vieux
0bd534adcf
Merge pull request #1211 from dotcloud/new_logs
...
*Runtime: Logs are now synchronised
2013-07-19 06:43:29 -07:00
Victor Vieux
cfec1c3e1b
add ps args to docker top
2013-07-19 10:06:32 +00:00
Nan Monnand Deng
cd209f406e
documentation.
2013-07-18 14:22:49 -04:00
Victor Vieux
1b0fd7ead3
add debug and simplify docker logs
2013-07-18 13:29:40 +00:00
Victor Vieux
a926cd4d88
add legacy support
2013-07-18 13:25:47 +00:00
Victor Vieux
2db99441c8
prevent any kind of operation simultaneously
2013-07-17 20:39:36 +00:00
Victor Vieux
5a934fc923
fix docker rmi via id
2013-07-17 15:48:53 +00:00
Victor Vieux
fb005a3da8
add server.ContainerTop, server.poolAdd and ser.poolRemove tests
2013-07-16 14:38:18 +00:00
Victor Vieux
599f85d4e4
store both logs in a same file, as JSON
2013-07-15 16:17:58 +00:00
Marcus Farkas
bac5772312
*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.
2013-07-12 20:15:25 +02:00
Victor Vieux
9232d1ef62
Merge branch 'master' into list_container_processes-feature
2013-07-12 11:47:27 +00:00
Nan Monnand Deng
d40efc4648
added client's kernel version
2013-07-10 18:56:49 -04:00
Nan Monnand Deng
5705a49308
Insert version checkers when call NewRegistry()
2013-07-10 18:56:49 -04:00
Nan Monnand Deng
65185a565b
added APIVersion when call NewRegistry
2013-07-10 18:53:38 -04:00
Sam Alba
f44eac49fa
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
2013-07-09 11:30:12 -07:00
Sam Alba
31c66d5a00
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.
2013-07-08 17:26:50 -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
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
unclejack
9ee11161bf
validate memory limits & error out if less than 512 KB
2013-06-14 19:52:44 +03:00
Victor Vieux
ddf5a1940f
Merge branch 'master' into 22-add_sizes_images_and_containers-feature
2013-06-14 10:05:06 +00:00
Victor Vieux
00cf2a1fa2
fix virtual size on images
2013-06-14 10:05:01 +00:00
Victor Vieux
c46382ba29
rebase master
2013-06-13 17:58:06 +00:00
Solomon Hykes
5ecfe13be9
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
2013-06-12 20:30:07 -07:00
Victor Vieux
f2383151cb
bump to master
2013-06-12 17:39:32 +00:00
Guillaume J. Charmes
3491df6edb
Merge pull request #852 from dotcloud/556-docker-search-fmt
...
Remove CR/NL from description in docker CLI
2013-06-12 10:17:05 -07:00
Victor Vieux
20bf0e00e8
* Remote Api: Add flag to enable cross domain requests
2013-06-11 10:12:36 +00:00
Victor Vieux
66d9a73362
rebump
2013-06-10 21:05:54 +00:00
shin-
d227af1edd
Escape remote names on repo push/pull
2013-06-10 11:28:27 -07:00
shin-
4e18010731
Support for special namespace 'src' (highland support)
2013-06-10 11:28:26 -07:00
shin-
db3242e4bb
Send X-Docker-Endpoints header when validating the images upload with the index at the end of a push
2013-06-10 11:21:56 -07:00
shin-
8d4282cd36
Remove CR/NL from description in docker CLI. Also moved description shortening to the client
2013-06-07 06:09:24 -07:00
Guillaume J. Charmes
f355d33b5f
Make the progressbar take the image size into consideration
2013-06-06 18:16:16 -07:00
Guillaume J. Charmes
84d68007cb
Add -dns to docker daemon
2013-06-05 14:20:54 -07:00
Victor Vieux
bf63cb9045
bump to master again
2013-06-05 16:01:36 +00:00
Victor Vieux
ce0041832c
bump to master
2013-06-05 15:30:45 +00:00
Victor Vieux
c906239220
bump to master
2013-06-05 10:23:45 +00:00
Victor Vieux
b4682e6707
bump to master
2013-06-05 10:19:51 +00:00
Victor Vieux
fd224ee590
linted names
2013-06-04 18:00:22 +00:00
Victor Vieux
3922691fb9
fix progress message in client
2013-06-04 16:09:08 +00:00
Victor Vieux
b6825f98c0
bump to master
2013-06-04 14:00:18 +00:00
Victor Vieux
86ada2fa5d
drop/omit
2013-06-04 13:51:12 +00:00
Michael Crosby
6d5bdff394
Add flag to enable cross domain requests in Api
...
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api. The default value is false for this
flag to not allow cross origin request to be made.
Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
2013-06-03 21:39:00 -04:00
Sam Alba
830c458fe7
Fixed missing Body.Close when doing some HTTP requests. It should improve some request issues.
2013-06-03 12:14:57 -07:00
Victor Vieux
7e59b83053
removed auth in pull
2013-06-03 17:51:52 +00:00
Guillaume J. Charmes
0443cc351d
Merge pull request #772 from dotcloud/improve_version_info_cmds
...
* API: Improve version info cmds
2013-06-03 06:36:09 -07:00
Victor Vieux
ca902b6be4
bump master
2013-06-03 12:37:51 +00:00
Victor Vieux
844a8db6c6
add debug
2013-06-03 12:21:22 +00:00
Victor Vieux
62c78696cd
bump to master
2013-06-03 11:06:13 +00:00
Guillaume J. Charmes
9bc71c101c
Merge pull request #719 from dotcloud/json_stream-feature
...
* API: push, pull, import, insert -> Json Stream
2013-05-31 16:05:15 -07:00
Guillaume J. Charmes
1dae7a25b9
Improve the docker version and docker info commands
2013-05-31 15:53:57 -07:00
Victor Vieux
468e4c4b56
returns an error if the container we want to attach is not running
2013-05-31 15:34:23 +00:00
Victor Vieux
9060b5c2f5
added proper returns type, move the auto-prune in v1.1 api
2013-05-31 14:37:02 +00:00
Victor Vieux
3afdd82e42
bump to master
2013-05-30 23:38:40 +00:00
Victor Vieux
5aa95b667c
WIP needs to fix HTTP error codes
2013-05-30 22:53:45 +00:00
Guillaume J. Charmes
054451fd19
NON-WORKING: Beginning of rmi refactor
2013-05-30 12:30:21 -07:00
Victor Vieux
cd002a4d16
ensure progress downloader is well formated
2013-05-30 17:00:42 +00:00
Victor Vieux
49e656839f
move auth to the client WIP
2013-05-30 15:39:43 +00:00
Victor Vieux
7e92302c4f
auto prune WIP
2013-05-29 17:27:32 +00:00
Victor Vieux
94f0d478de
refacto
2013-05-29 17:01:54 +00:00
Victor Vieux
2eb4e2a0b8
removed the -f
2013-05-29 16:31:47 +00:00
Guillaume J. Charmes
08e5f12954
Merge pull request #739 from dotcloud/push_issue-1
...
- Registry: Cereate a new registry object for each request (~session)
2013-05-29 09:22:12 -07:00
Victor Vieux
f339fc2eb9
bump to master
2013-05-29 13:52:18 +00:00
Victor Vieux
ea9095c562
merge master
2013-05-29 11:49:39 +00:00
Guillaume J. Charmes
cd0de83917
Cereate a new registry object for each request (~session)
2013-05-28 17:12:24 -07:00
Guillaume J. Charmes
a48799016a
Fix merge issue
2013-05-28 13:46:52 -07:00
Guillaume J. Charmes
dce82bc856
Merge master
2013-05-28 13:42:50 -07:00
Victor Vieux
5a36efb61f
fix json encoding, and use less casts
2013-05-26 23:45:45 +00:00
Victor Vieux
14212930e4
ensure valid json
2013-05-25 15:51:26 +00:00
Victor Vieux
c8c7094b2e
imporved error, push, import insert
2013-05-25 15:09:46 +00:00