d91ae65280
clean some redundant else clauses
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-19 10:54:04 +08:00
48231d623f
adding nicer help when missing arguments ( #11858 )
...
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net>
2015-05-19 12:02:13 +10:00
3b69ca5b97
Merge pull request #13277 from runcom/restartpolicy-methods
...
RestartPolicy methods instead of strings checking
2015-05-18 14:36:54 -04:00
692b7b911e
Merge pull request #13271 from Microsoft/10662-nounixsocket
...
Windows: No unix_socket.go
2015-05-16 21:34:15 -04:00
b5e932a3bf
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
2015-05-16 09:05:03 -07:00
624bf81fdb
Add RestartPolicy methods instead of using strings checking
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-16 14:15:28 +02:00
6c187b8b4b
Windows: No unix_socket.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-15 15:49:02 -07:00
1630ed97ac
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-15 20:21:59 +00:00
b261ce5fb0
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882
2015-05-14 17:31:45 -07:00
ac81cd1fc3
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
2015-05-14 10:36:50 -04:00
1c5a4728e1
Merge pull request #13208 from ahmetalpbalkan/nit
...
Remove out of date comment
2015-05-14 06:59:21 -07:00
3f4926e49b
Fix a regression in `docker import` on error from URL
...
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake. This removes the ":" from "... err := " which fixes it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-14 06:56:52 -07:00
9448d3627b
Remove out of date comment
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-14 07:37:31 +00:00
1d57642906
Merge pull request #11706 from HuKeping/time
...
Fix inconsistent date formats in API
2015-05-13 20:23:19 -07:00
945fc9d882
Fix inconsistent date formats in API
...
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history
display the Created Time as UNIX format which doesn't make sense.
These should be more readable as CLI command `docker inspect` shows.
Due to the case that an older client with a newer version daemon, we
need the version check for now.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-14 18:58:55 +08:00
951c2ef2c9
Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring
...
daemon: Logging drivers architectural refactoring
2015-05-13 11:00:50 -07:00
56847ec4d4
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
2015-05-13 05:23:56 +02:00
36d995a291
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
2015-05-12 18:24:04 -07:00
3985f17812
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
2015-05-12 18:04:33 -07:00
0024935f64
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-12 17:22:41 -07:00
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 00:09:41 +02:00
aed8f9f76e
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-12 14:26:57 -07:00
cb53a628b0
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
2015-05-12 13:49:47 -07:00
f35038dfba
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
2015-05-12 13:08:36 -07:00
3a8728b431
daemon: Logging drivers refactoring
...
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
(easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
existing behavior)
Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-12 19:11:52 +00:00
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-12 20:09:49 +02:00
d4eba30065
Merge pull request #13141 from vieux/fallback_inspect
...
fallback to interface with docker inspect
2015-05-12 11:02:06 -07:00
3b13e56fd7
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
2015-05-12 10:27:43 -07:00
52c3bb6a0e
fallback to interface with docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-11 17:39:21 -07:00
78604a9f3f
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-11 15:28:08 -07:00
e2acca67c8
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 19:56:41 +02:00
cb9a6b9aed
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-10 20:42:14 +00:00
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
223d6de728
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-08 12:33:33 -06:00
372977148d
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
2015-05-07 16:51:56 -07:00
404412282d
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
2015-05-07 16:27:15 -07:00
94def48878
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
2015-05-07 22:25:13 +05:30
d78755d159
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
2015-05-07 09:38:59 -07:00
68e9c07850
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-05-07 15:43:50 +00:00
74121a4211
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-07 01:49:16 +02:00
e960e4bb12
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
2015-05-05 14:46:47 -07:00
5a6db4fd44
a few cleanups for client output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-05 15:59:17 +08:00
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
2015-05-05 08:54:28 +02:00
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
3fcf387d52
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
2015-05-04 15:51:56 -04:00
4895a887e2
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
2015-05-04 13:03:28 -04:00
f3023a93d1
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-04 10:49:13 -04:00
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
15313dfdf3
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
2015-05-03 11:10:14 -04:00
28547a1a3a
Remove empty line after client.CmdInspect docstring #12706
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2015-05-03 17:23:18 +08:00
c7cfdb65aa
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 03:12:58 +02:00
393678474f
Merge pull request #12924 from runcom/provide-struct-to-cli-stream
...
Provide a struct to configure cli streaming
2015-05-01 15:10:58 -07:00
d9639409fd
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-01 20:23:44 +02:00
79f13d1497
fix docker rm name issue
...
Addresses https://github.com/docker/docker/issues/12308
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-01 22:26:40 +08:00
68ee5bdf96
Don't wrap 'cp' help too soon.
...
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.
This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.
The \n made the output look funky.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-30 14:43:14 -07:00
86d1223a29
Windows: mkdirall volume path aware
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
2015-04-30 11:59:42 -07:00
531f4122bd
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 01:35:16 +02:00
534ed8c2d4
Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-29 06:20:33 -07:00
f2f8e4c5c9
Merge pull request #12870 from coolljt0725/fix_rename_help
...
Fix docker rename help not consistent with other commands
2015-04-29 09:14:03 -04:00
0e752adf55
Fix docker rename help not consistent with other commands
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-29 19:37:20 +08:00
c7812f01c7
fix a minor inspect format issue
...
Before, inspect cont1 cont2 shows:
[{
xxx
}
,{
xxx
}
]
After, it shows:
[
{
xxx
}
,{
xxx
}
]
Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.
To get symmetry, above is our choice.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-28 18:51:04 +08:00
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
572ba9cb40
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
2015-04-27 14:13:03 -04:00
6d9439c627
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-27 12:41:03 +08:00
bb41193998
Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42
...
Signed-off-by: Julien Barbier <write0@gmail.com>
2015-04-25 15:25:51 -04:00
daad696e09
Fix error prompt for pull & import handler postImagesCreate.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-25 09:10:32 +08:00
790c63a5ef
Merge pull request #12502 from calavera/shallow_git_history
...
Shallow clone using git to build images.
2015-04-24 10:16:01 -07:00
1cfb307d70
Remove duplicated git clone logic.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-24 09:39:45 -07:00
5f4fb8be00
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-24 08:54:08 +08:00
66acef865d
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-24 08:38:14 +08:00
fa2c68a89e
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 23:36:29 +02:00
799cf056e7
Merge pull request #11839 from brahmaroutu/template_11641
...
Allow go template to work properly with inspect …
2015-04-23 13:07:40 -07:00
1492a7d7fd
Merge pull request #12702 from LK4D4/good_ol_flushed
...
Return weird behaviour of returning json errors
2015-04-23 13:03:29 -07:00
c4914f071f
Merge pull request #12577 from jfrazelle/actually-depreciate-rm
...
actually depreciate -rm insteam of --rm.. and a few others
2015-04-23 11:55:20 -07:00
9ed5bfb083
Merge pull request #12636 from duglin/MoveConfig
...
Move CLI config processing out from under registry dir
2015-04-23 11:50:31 -07:00
2c70288ca6
Merge pull request #12703 from LK4D4/carry_12596
...
remove job from image_export
2015-04-23 14:27:59 -04:00
231d362db7
Allow go template to work properly with inspect
...
Closes #11641
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-04-23 18:25:18 +00:00
2345389975
Merge pull request #12687 from WeiZhang555/NotFound
...
refactor httpError() and add 404 "not found" mapping
2015-04-23 11:21:09 -07:00
2a14b7dd35
remove job from image_export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-23 10:54:25 -07:00
ec51ba01db
Return weird behaviour of returning json errors
...
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-23 10:27:37 -07:00
bb9da6ba92
Move CLI config processing out from under registry dir
...
No logic changes should be in here, just moving things around.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-23 10:18:38 -07:00
2351b87551
Merge pull request #12505 from ZJU-SEL/remove_job_from_push
...
remove job from push
2015-04-23 09:57:17 -07:00
71ac5b7903
Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver
...
fix test case name
2015-04-23 09:21:00 -07:00
d456401fe1
remove job from push
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-23 21:21:56 +08:00
ab42a3a23a
refactor httpError() and add 404 "not found" mapping
...
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-04-23 19:37:47 +08:00
70bb0d8ed7
remove job from load
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-23 19:13:12 +08:00
a8d2fbe7b4
fix test case name
...
Name like this will never run by go test. And this test case won't
get PAAS.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-23 18:41:30 +08:00
eae272f90e
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
2015-04-22 23:06:13 -04:00
b0ef3194aa
fix inspect format result
...
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-23 09:28:07 +08:00
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
5ea8dc376c
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
2015-04-22 20:28:24 -04:00
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 00:58:13 +02:00
3c9ae03a86
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
2015-04-22 15:32:14 -07:00
fd4f7c4e5c
Correctly format API error on image pull
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-04-22 14:11:25 -07:00
24425021d2
remove execCreate & execStart from job
...
Also removed the function ExecConfigFromJob
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-22 13:51:57 -07:00
58065d0dd9
Fix golint errors in docker/api/client
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-04-22 00:14:23 -07:00
a2f74aa4b4
Remove chain of engine passing from builder to loadManifest
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-21 14:55:23 -07:00
27811355bd
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 18:14:39 +02:00
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
47b703593e
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
2015-04-20 17:28:24 -07:00
82f75df9e9
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
2015-04-20 17:27:17 -07:00
4bb8924b52
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
2015-04-20 17:26:09 -07:00
f3d4c33213
actually depreciate -rm, -sig-proxy, -name, seriously its been forever
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-20 17:20:23 -07:00
4a25c5d25b
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
2015-04-20 17:02:43 -07:00
3b05005a12
Add flusher check to utils.WriteFlusher.
...
That way we can know when the stream has been flushed.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 14:25:45 -07:00
ae4063585e
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:06 -07:00
9a2c009751
Remove engine.Job references from builder.CmdBuild
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:04 -07:00
08ef006d17
Merge pull request #12009 from duglin/AddConfig
...
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
2015-04-20 13:12:17 -07:00
18c9b6c645
Add .docker/config.json and support for HTTP Headers
...
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
which adds these http headers to all msgs from the cli
In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-20 13:05:24 -07:00
da7bca4496
Make all http handlers api.server.Server methods
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-20 09:45:31 -07:00
66239ab5c9
change httpError logic
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
2015-04-20 23:26:56 +08:00
dcc50e1d59
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-20 08:16:47 -07:00
d9ed316522
Make API server datastructure
...
Added daemon field to it, will use it later for acces to daemon from
handlers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-20 08:13:39 -07:00
b5584ec24a
Merge pull request #12537 from hqhq/hq_remove_unused_function
...
remove unused function in server_unit_test.go
2015-04-20 07:51:53 -07:00
f4942ed864
Remove Job from Info API
...
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-20 18:14:06 +08:00
641a7ec9ad
remove unused function in server_unit_test.go
...
After engine refactor, some functions are no longer used.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-20 16:27:47 +08:00
edf541c22b
gofmt whole directory
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-20 01:08:51 -07:00
b1d8ae3824
Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
...
remove job from tag
2015-04-19 16:02:28 -04:00
99f6309b97
remove job from tag
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-04-19 18:36:56 +08:00
055c6dbaef
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
2015-04-17 15:26:30 -04:00
6e38a53f96
remove job from pull and import
...
Closes #12396
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-17 09:55:02 -07:00
a0bf80fe03
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-17 14:27:38 +02:00
b052f7a87c
Change log severity for non-tlsverify bind
...
closes #12459
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-17 21:27:58 +08:00
e41192a3f8
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-16 18:50:24 +02:00
ae5cf30c7c
Add -H|--human flag to `docker history`
...
Add a flag to print sizes and dates in human readable format.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-16 08:38:18 -07:00
dcff07d03d
Adding a verbose time option to output formatted timestamps
...
Fixes #11413
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-16 08:34:50 -07:00
de923f59b3
Merge pull request #12253 from calavera/remove_job_from_start_and_create
...
Remove engine.Job from Start and Create
2015-04-15 21:49:25 -04:00
83d809f3d2
Merge pull request #12388 from xiaods/issue-12373
...
client.StatusError don't be returned as a pointer
2015-04-15 17:34:38 -07:00
bae3023eef
client.StatusError don't be returned as a pointer
...
closes #12373
1. remove & from client.StatusError
2. remove * from Error method
Signed-off-by: Deshi Xiao <xiaods@gmail.com>
2015-04-16 01:27:07 +08:00
767df67e31
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-15 10:22:07 -07:00
f8dc7e8754
Add cpuset-mems support for docker build
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:34:12 +08:00
98996a432e
Remove engine.Job from Create action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
610c436e07
Remove engine.Job from Start action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
5395cdcae5
Merge pull request #12269 from kostickm/12251-remove-not-empty-check
...
Remove container name not empty check
2015-04-14 17:55:13 -04:00
98f857772f
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-14 11:27:06 -07:00
5be5749d54
Merge pull request #12370 from buddhamagnet/11593-api-client-docs
...
add docs for DockerCli and NewDockerCli fixes #11593
2015-04-14 11:00:19 -07:00
69747b3c1e
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
2015-04-14 18:33:11 +01:00
392fd243bc
Merge pull request #12365 from HuKeping/list
...
Use local variable err instead of a outer one
2015-04-14 12:49:15 -04:00
a0804e8e11
Use local variable err instead of a outer one
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-15 00:29:53 +08:00
c30a55f14d
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-14 01:37:36 +02:00
6fa2a1e486
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
2015-04-13 13:32:45 -07:00
75b911eb3c
Merge pull request #12222 from chenhanxiao/cp-support-colon
...
cp: add support for copy filename with ":"
2015-04-13 13:09:12 -07:00
3509132a6e
Merge pull request #12301 from ewindisch/https_links
...
Use HTTPS links for URLs in READMEs / comments / docs
2015-04-13 14:30:53 -04:00
6f928be7ef
Merge pull request #12320 from runcom/fix-api-resize-exec-resize
...
fix api server resize&execResize
2015-04-13 09:59:11 -07:00
33e83d0581
Merge pull request #12279 from runcom/remove-job-commit
...
Remove job from commit
2015-04-13 09:57:54 -07:00
12eff0c26f
Merge pull request #12312 from runcom/remove-job-container-stats
...
Remove job from container stats
2015-04-13 11:58:31 -04:00
a4f98d3225
Merge pull request #12313 from runcom/remove-job-export
...
Remove job from export
2015-04-13 11:57:55 -04:00
bfb487dc50
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
2015-04-13 08:38:46 -07:00
6b737752e3
Remove job from export
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 15:27:45 +02:00
3341f3a355
fix api server resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:42:12 +02:00
65a056345c
Remove jobs from stats
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:33:53 +02:00
91bfed6049
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:25:31 +02:00
a54fd325e6
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
2015-04-12 08:30:38 -04:00
04cc6c6aa4
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:41:16 +02:00
621ee1f6a4
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:15:34 +02:00
ca37301d54
Link to HTTPS URLs in engine comments
...
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-04-11 13:31:34 -04:00
d6d8f45b04
change memory usage display
...
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2015-04-11 20:04:34 +08:00
c8529fde5f
Remove job from commit
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-11 00:20:45 +02:00
db0ffba3b9
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 20:17:02 +02:00
bae3273ef4
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
2015-04-10 10:56:01 -07:00
267bd51adb
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
2015-04-10 10:52:18 -07:00
0693e34d7e
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
2015-04-10 09:53:05 -04:00
5c7c3fea6c
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-10 21:37:56 +08:00
5037297388
cp: add support for copy filename with ":"
...
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-04-10 00:08:05 -04:00
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-09 21:29:42 -04:00
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:41 -04:00
3e096cb9c9
Remove Job from `docker top`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 18:17:50 -07:00
3cb751906a
Remove Job from `docker kill`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 16:06:54 -07:00
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 00:56:43 +02:00
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
67676529b3
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
2015-04-09 14:10:21 -07:00
5ccb1c764b
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 22:50:48 +02:00
ccdef895de
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-09 13:05:31 -07:00
92a775bd7a
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
2015-04-09 11:24:20 -07:00
3218f3936d
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
2015-04-09 11:21:52 -07:00
e4afc379dc
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 19:39:14 +02:00
0fec3e19db
Fix regressions in attach
...
* Wrong bool parsing
* Attach always all streams
Were introduced in #12120
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-09 09:58:44 -07:00
db13cb7f98
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 18:46:24 +02:00
6ba7bf440e
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
2015-04-09 09:19:09 -07:00
8295bed3df
Merge pull request #12207 from WiseTrem/getBoolParam
...
Removing unused getBoolParam func from api/server/server.go
2015-04-09 08:28:48 -07:00
49c4de4aeb
Remove Job from rename
...
A part of ISSUE#12151-Remove engine.Job mechanism
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-10 01:52:55 +08:00
0fc75a3136
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
2015-04-09 09:13:16 +03:00
d045b9776b
Remove Job from `docker images`
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 19:33:01 -07:00
53582321ee
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-08 18:50:29 -04:00
7233bd223d
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
2015-04-08 13:43:47 -07:00
88119bb276
Fixing JSON Tags
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-08 12:05:12 -07:00
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 10:30:17 -07:00
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
e379e2668c
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-08 15:52:10 +02:00
dccda72a41
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
2015-04-07 18:13:35 -04:00
c44f513248
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 14:23:09 -07:00
e011119a49
Merge pull request #12129 from duglin/RemoveTable5
...
Remove engine.Table from more daemon side stuff
2015-04-07 12:53:55 -04:00
c9eb37f975
Remove engine usage for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 08:43:18 -07:00
650bc2ffe5
Remove engine.Table from more daemon side stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-06 15:06:02 -07:00
6e44246fed
Swap width/height in GetWinsize and monitorTtySize
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-06 14:31:42 -07:00
dec48d6708
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
2015-04-06 16:33:29 -04:00
ed8d402851
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
2015-04-06 11:11:31 -07:00
065648a832
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-06 10:55:53 -07:00
7d0053d554
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-04-06 09:05:03 -04:00
b2fbd9e632
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
2015-04-03 21:29:36 +00:00
67b4cce0f6
Remove engine.Table from docker search and fix missing field
...
registry/SearchResults was missing the "is_automated" field.
I added it back in.
Pull this 'table' removal one from the others because it fixed
a bug too
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 11:27:30 -07:00
e64f6baf11
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
2015-04-03 11:27:06 -07:00
b3e9c274dd
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
2015-04-03 18:25:12 +00:00
326a5545d4
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
2015-04-03 10:57:52 -07:00
0b2fa9c707
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 08:31:30 -07:00
87e0e4eb43
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-03 08:55:34 +08:00
49c72506ac
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-02 16:55:58 -07:00
3bea892d54
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-02 09:53:40 +03:00
7433c9c92a
Make server_windows.go consistent with server_linux.go
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-04-01 17:31:15 -07:00
34f44c642f
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-04-01 17:31:09 -07:00
3fe7a3d537
Merge pull request #12005 from LK4D4/bump_docs
...
Bump API version and docs to v1.19
2015-04-01 15:34:28 -07:00
81f9b72c64
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-01 13:40:56 -07:00
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
d351aef8af
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-01 07:37:10 -07:00
f5a401d3fe
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-01 16:05:14 +08:00
03d3d79b2b
Remove jobs from registry.Service
...
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 16:38:04 -07:00
596ddef7d7
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
2015-03-31 16:37:32 -07:00
c717475714
Fix panic in integration tests
...
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-31 15:12:15 -07:00
62806cc85e
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 13:37:49 -07:00
7609d52797
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 11:38:17 -07:00
ddbc68f564
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
2015-03-31 11:14:04 -04:00
d8c628cf08
Ensure that bridge driver does not use global mappers
...
This has a few hacks in it but it ensures that the bridge driver does
not use global state in the mappers, atleast as much as possible at this
point without further refactoring. Some of the exported fields are
hacks to handle the daemon port mapping but this results in a much
cleaner approach and completely remove the global state from the mapper
and allocator.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 18:28:24 -07:00
8f6a14452d
Avoid ServeApi race condition
...
If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation. This is due to the fact
that when "acceptconnections" ran the activation channel was nil.
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-30 17:39:43 -07:00
fe9f3227b1
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
2015-03-30 13:53:09 -07:00
00a15227f8
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
2015-03-30 13:35:40 -07:00
5670c6c695
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-29 03:22:46 +02:00
8b795a05a8
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
2015-03-28 17:55:45 +01:00
cee62a95a2
Add nice error message
...
Generally, when using Remote API to push images there needs a http Header
X-Registry-Auth.
For compatibility if there was no authConfig header, everything will be
okay if a proper JSON-http-body was applied.
But when both X-Registry-Auth Header and the Body are missing, due to
the function of decode JSON, it will return an EOF error which was not
very clear to user.
So I think we can make the respone error be more nice.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-03-28 16:27:30 +08:00
013fb87543
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-28 09:07:20 +08:00
c088486093
Merge pull request #11845 from lobatt/master
...
Issue #11836
2015-03-27 14:55:04 -07:00
6d21b2ba80
Replace fmt.Fprint* with io.WriteString
...
This fixes vet warnings in api/client/stats.go
Fixes #11825
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-03-27 13:08:20 -07:00
da5c863d20
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
2015-03-26 23:55:50 -07:00
f581f74209
Issue #11836
...
Signed-off-by: chli <chli@freewheel.tv>
2015-03-26 19:18:23 -04:00
ebbceea8a7
windows: monitorTtySize correctly by polling
...
This change makes `monitorTtySize` work correctly on windows by polling
into win32 API to get terminal size (because there's no SIGWINCH on
windows) and send it to the engine over Remove API properly.
Average getttysize syscall takes around 30-40 ms on an average windows
machine as far as I can tell, therefore in a `for` loop, checking every
250ms if size has changed or not.
I'm not sure if there's a better way to do it on windows, if so,
somebody please send a link 'cause I could not find.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-26 16:08:05 -07:00
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-26 23:22:04 +01:00
ae907e7af1
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
2015-03-26 15:05:45 -06:00
6b2eeaf896
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com>
2015-03-26 18:59:16 +00:00
708ed9d87a
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
2015-03-26 10:58:35 -07:00
b9d19fdaef
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
2015-03-26 09:28:33 -07:00
d4fca8047c
Merge pull request #11789 from parknicker/PostContainerWaitFix
...
Changes response of postContainersWait to use a struct
2015-03-26 08:40:00 -07:00
89d63d2a82
fixes comment for ContainerWaitResponse struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com>
2015-03-25 22:22:58 -06:00
2a5a402c71
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 20:07:00 -07:00
1bc266dfa7
Changes response of postContainersWait to use a struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com>
2015-03-25 21:01:14 -06:00
a465e26bb0
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 19:54:29 -07:00
0cd6c05d81
Fixes hacks from progressreader refactor
...
related to #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-25 18:21:02 -07:00
e589dc7424
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
2015-03-25 16:24:57 -07:00
c79b9bab54
Remove engine.Status and replace it with standard go error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-25 22:32:08 +01:00
b5d0380108
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 14:17:11 -07:00
161c2e5e74
Rename Fds to File Descriptors in docker info
...
This makes the docker info more readable. Also change a log line
in a test file renaming Fds
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-03-25 12:04:15 -07:00
0d65069a17
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-25 08:45:14 -07:00
58690c9cca
api/client - The code for all cli commands are in one file #11610
...
Signed-off-by: Joey Gibson <joey@joeygibson.com>
2015-03-24 23:57:23 -04:00
73dab8205a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
2015-03-24 14:43:09 -07:00
8eee55a35c
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
2015-03-24 11:45:07 -07:00
b80fae7356
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 18:19:59 +01:00
babd1b3e1f
Return AuthResponse from postAuth api endpoint, Fixes #11607
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 09:57:01 +01:00
c136591f40
Add comments to api/common constants, closes #11583
...
Signed-off-by: Avi Das <andas222@gmail.com>
2015-03-23 22:35:41 -05:00
e6b7d93072
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
2015-03-23 17:52:15 -07:00
d5eea4e8b0
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
2015-03-23 16:58:29 -07:00
0c3d2f6f96
Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 00:41:54 +01:00
197a3f0a98
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
2015-03-23 15:38:51 -07:00
bd95202161
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
2015-03-23 10:17:50 -07:00
d124197cc7
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 13:03:31 +01:00
a91b2431a3
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-22 23:53:47 -07:00
7dc1af146d
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-23 12:10:22 +08:00
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
e09ead98ef
Merge pull request #11566 from tiborvass/carry-10864
...
Carry 10864: ANSI terminal emulation for windows
2015-03-22 18:21:32 -07:00
671c12204c
Implement build cancellation
...
Add the capability to cancel the build by disconnecting the client.
This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.
This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.
* Add documentation of cancellation to cli and API
* Protect job cancellation with sync.Once
* Add TestBuildCancelationKillsSleep
* Add test case for build cancellation of RUN statements.
Signed-off-by: Peter Waller <p@pwaller.net>
2015-03-22 11:31:28 +00:00
c536e5bfb4
Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
...
Add cli build warning about chmod bits on windows
2015-03-20 19:19:38 -04:00
4a8b3cad60
Add cli build warning about chmod bits on windows
...
This shows a warning message about adjusted file/directory permission bits
when the `docker build` cli command is executed on windows.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-20 20:13:32 +00:00
16309bef63
Add integration test for unix sock cleanup
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-20 12:34:35 -04:00
0c0e9836c4
Implement cleanup unix sockets after serving.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-03-20 09:12:59 -04:00
2cde817458
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
e6ae89a45a
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-18 20:57:13 -04:00
8ec4e69839
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
2015-03-18 19:04:43 -04:00
29f809233e
Merge pull request #11464 from ncdc/fix-duplicate-dangling-images
...
Fix duplicate display of dangling images
2015-03-18 13:53:33 -07:00
50bf3cbedc
Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
...
Clarify behavior of docker cp
2015-03-18 08:46:52 -07:00
c680dd9e5a
Fix duplicate display of dangling images
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-18 10:41:01 -04:00
1ff5a91007
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
2015-03-17 09:45:58 -07:00
a2b0c9778f
Add ability to refer to image by name + digest
...
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-17 10:10:42 +00:00
5ff122f797
Modified `docker export` to allow an --output flag
...
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added an --output flag to docker export and created tests.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added text to reflect a new output option for the export command.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Whitespace clean up
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added man page documentation for the new --output flag in export
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
2015-03-17 00:20:19 -07:00
88f437d6c6
Merge pull request #11402 from miminar/err-cleanup
...
Error formatting cleanups
2015-03-16 16:13:16 -07:00
66bf7a269a
Merge pull request #11300 from Microsoft/10662_jjh_server_factor_serverfd_and_systemd_for_windows
...
Factor out ServeFD & systemd in server for Linux only (Not Windows)
2015-03-16 14:12:48 -07:00
45262c4cb0
Use syscall consts, check for errors,
...
Also rename func for non-windows specific names.
Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
2015-03-16 14:04:56 -07:00
d8c3090dd9
ANSI terminal emulation for windows
...
It is implemented by intercepting and interpreting the output
escape sequence by calling win32 console apis.
In addition the input from win32 console is translated to linux keycodes
Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
2015-03-16 14:04:49 -07:00
8ae20d8eba
Merge pull request #10977 from robertabbott/10959-progressreader
...
Moves progressreader from utils to its own package
2015-03-16 12:45:33 -07:00
9a78ed8f48
Clarify behavior of docker cp
...
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.
Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-16 12:44:28 -07:00
210ab030bc
Format error by value
...
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.
Signed-off-by: Michal Minar <miminar@redhat.com>
2015-03-16 12:05:53 +01:00
8ef79ae8e4
Correctly check that gid parses as an int
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-14 23:02:53 +00:00
bdf3a0295d
Fail docker logs on all logging drivers apart from 'json-file'
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 15:02:09 -07:00
334382a8c3
Allow a non-existent groupid to own the docker socket
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-13 18:12:50 +00:00
e781c9624c
Merge pull request #10620 from acbodine/notify_user_of_creds_save
...
Adds: notify user of login credential persistence for registry
2015-03-12 13:43:20 -07:00
24408f1c18
Merge pull request #11325 from duglin/11289-HelpDashF
...
Minor tweak to build -f text to make it clear Dockerfile is in context
2015-03-11 14:58:38 -07:00
d010bf0d99
Merge pull request #11291 from ahmetalpbalkan/info/system-date
...
Add system time to /info
2015-03-11 09:43:43 -07:00
1b46248a33
Minor tweak to build -f text to make it clear Dockerfile is in context
...
Closes #11289
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-11 09:04:30 -07:00
2b051bcbda
Normalize the log for docker subcommand usage,
...
delete unecessary blank after "[OPTIONS] "
and add a blank to the log between options and signature.
To make the code style consistency.
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-11 18:58:32 +08:00
12b278d354
Remove import to utils in progressreader
...
Added method in StreamFormatter to handle calls
from progressreader. Solves #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-11 00:50:27 -07:00
2977fd2b7a
Add system time to /info
...
This change adds daemon's system time as RFC3339Nano to the `/info` endpoint
and shows in a more readable format (UnixDate) in `docker -D info` output.
I will be using this to fix the clock skew between the remote test host and
the CI machines running `docker events`-related tests as they're using `--since`
and `--until` and the timestamps are not matching when daemon is not on the
same machine.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-10 15:29:05 -07:00
081c6c76e2
Factor out ServeFD & systemd in server for Linux only (Not Windows)
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-03-10 15:06:16 -07:00
8be1671f45
Merge pull request #11288 from estesp/warn-on-localhost-dns
...
Add warning for --dns flag set to localhost addresses.
2015-03-10 12:03:46 -07:00
Zhang Wei
Jason Shepherd
Brian Goff
Alexander Morozov
Antonio Murdaca
John Howard
Ahmet Alp Balkan
Victor Vieux
Doug Davis
Doug Davis
Sebastiaan van Stijn
Hu Keping
David Calavera
Antonio Murdaca
Jessie Frazelle
Tibor Vass
Michael Crosby
Ma Shimiao
Tianon Gravi
Bharath Thiruveedula
Srini Brahmaroutu
Arnaud Porterie
Qiang Huang
Adria Casas
Phil Estes
jmzwcn
Lei Jitang
He Simei
Julien Barbier
Srini Brahmaroutu
Alexander Morozov
Josh Hawn
jianbosun
Peggy Li
Jessica Frazelle
Ankush Agarwal
Dave Henderson
Deshi Xiao
Megan Kostick
buddhamagnet
Michael Crosby
Evan Hazlett
Eric Windisch
Chen Hanxiao
Tibor Vass
David Young
WiseTrem
Shishir Mahajan
Yuan Sun
unclejack
Darren Shepherd
Deng Guangxing
Jamie Hannaford
chli
Peter Choi
Don Kjer
Nick Parker
bobby abbott
Joey Gibson
Avi Das
Mabin
Peter Waller
Rik Nijessen
Tibor Vass
moxiegirl
Andy Goldstein
Joseph Kern
Sachin Joshi
Mary Anthony
Michal Minar
Aidan Hobson Sayers
Zen Lin(Zhinan Lin)
John Howard (VM)