Victor Vieux
be282b57d5
fix offline image transfert
2013-12-04 11:55:42 -08:00
Victor Vieux
12180948be
remove unused parameter in Download
2013-12-04 11:54:11 -08:00
shin-
045989e3d8
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
2013-12-03 16:32:13 +01:00
Victor Vieux
67c03552f6
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
2013-12-02 12:13:07 -08:00
Michael Crosby
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
Guillaume J. Charmes
4e030c78d2
Merge branch 'master' into handle_sigquit
...
Conflicts:
server.go
2013-11-29 18:51:32 -08:00
Andrews Medina
a6c9a332d0
fixed some `go vet` issues.
2013-11-29 22:53:20 -02:00
Solomon Hykes
a4f8a2494b
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
2013-11-30 00:25:46 +00:00
Guillaume J. Charmes
db7c55ba7f
Catch SIGQUIT for cleanup
2013-11-29 14:13:00 -08:00
Guillaume J. Charmes
0d3f4017cf
Merge pull request #2929 from pnasrat/2928-fix-signal-handling
...
Remove incorrect SIGKILL handler.
2013-11-29 14:10:46 -08:00
Victor Vieux
cca9e51f5d
Merge pull request #2941 from codeaholics/2940-invalid-registry-calls
...
Stop invalid calls to Registry
2013-11-28 17:00:22 -08:00
Victor Vieux
597e0e69b4
split in 3 files
2013-11-28 12:16:57 -08:00
Victor Vieux
377817db1b
Merge pull request #2913 from pnasrat/2852-deleteimage-performance
...
Performance of deleteImageAndChildren.
2013-11-28 11:20:43 -08:00
Danny Yates
d47507791e
Stop invalid calls to Registry
...
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
2013-11-28 16:43:28 +00:00
Paul Nasrat
bdfe8ed403
Remove incorrect SIGKILL handler.
...
As per POSIX signal handling SIGKILL does not work.
Fixes #2928
2013-11-28 10:42:06 -05:00
Danny Yates
d1a631cedb
Only tag the top-most layer, not all interim layers
2013-11-27 22:00:58 +00:00
Paul Nasrat
4e826e99b2
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
2013-11-27 12:55:15 -05:00
Danny Yates
788feab3a7
Handle the case where poolAdd() gives an error for an unknown pool type
2013-11-27 16:53:36 +00:00
Danny Yates
ae474e05f5
Allow multiple clients to pull the same tag simultaneously
...
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
2013-11-27 12:18:01 +00:00
Guillaume J. Charmes
19df6c32c0
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
2013-11-25 19:01:13 -08:00
Solomon Hykes
1d903da6fd
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
2013-11-25 18:58:26 -08:00
Paul Nasrat
abfdaca3f8
Fix data race in TestLogEvent
...
Found with -race. Improve locking on Server.
2013-11-25 14:17:58 -05:00
Michael Crosby
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
Michael Crosby
d4c8fb9ee2
Merge pull request #2769 from vbatts/none_bridge
...
Do not setup bridge ip if 'none' bridge is provided
2013-11-22 11:48:33 -08:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Michael Crosby
25e443a3c7
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
Michael Crosby
d6e6214d37
Merge pull request #2678 from cxmcc/minor
...
Minor code simplification for Containers api
2013-11-21 16:27:15 -08:00
Michael Crosby
70f1bd3104
Merge pull request #2488 from viirya/fix_container_volumes_delete
...
Skip the volumes mounted when deleting the volumes of container.
2013-11-21 16:20:22 -08:00
Guillaume J. Charmes
42c23b0f04
Merge pull request #2763 from dotcloud/use_full_id_delete
...
Do ont truncate ID on docker rmi
2013-11-21 14:39:38 -08:00
Paul Morie
3f17844b6e
Fix typo in pullImage
2013-11-21 17:29:03 -05:00
Michael Crosby
253214f07d
Update ImageExport after merge fail
2013-11-21 10:26:21 -08:00
Michael Crosby
a2c9d2da93
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-21 10:21:30 -08:00
Michael Crosby
fd7ab143bf
Allow images to be saved and loaded by id and repository
2013-11-20 17:28:19 -08:00
Victor Vieux
8a756f417e
wait on pull already in progress
2013-11-20 14:04:19 -08:00
Michael Crosby
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
Guillaume J. Charmes
b4f7078a02
Merge pull request #2773 from dotcloud/speed_up_docker_ps
...
speedup docker ps
2013-11-20 10:40:03 -08:00
Vincent Batts
60cb5f1a34
do not setup bridge ip if bridgeNetwork is nil. This is the case when
...
-b='none' bridge is provided.
issue #2768
https://bugzilla.redhat.com/show_bug.cgi?id=1032094
2013-11-20 09:36:38 -05:00
Michael Crosby
9de4590498
Add typo in remove all. Ensure tmpDir is removed
2013-11-20 03:52:33 +00:00
Michael Crosby
0ef6fed5c7
Fix error checks for offline transfer and remove unneeded debug output
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
844c13bce6
Fixing build
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
6014db4a7e
Setting offline package version to 1.0
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
61a8020e51
Adding version info, switching to defer for cleanup
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Victor Vieux
145c2008ae
speedup docker ps
2013-11-19 11:02:10 -08:00
Victor Vieux
2fe4467d73
Do ont truncate ID on docker rmi
2013-11-18 18:39:02 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Victor Vieux
f946a486ea
Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup
...
Fix tmp dir never cleanup
2013-11-18 12:20:23 -08:00
Victor Vieux
9261690593
Fix tmp dir never cleanup
2013-11-15 16:23:55 -08:00
Guillaume J. Charmes
cbd1281ec9
rename gograph in graphdb
2013-11-15 15:55:45 -08:00
Alexander Larsson
243843c078
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
2013-11-15 11:04:02 +01:00
Alexander Larsson
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Solomon Hykes
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
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