Jeffrey Morgan
5187e5ae15
Bump to 0.5.19
2015-04-21 13:17:36 -04:00
Jeffrey Morgan
49a20aeb1a
Merge branch 'master' of github.com:kitematic/kitematic
2015-04-21 13:16:54 -04:00
Jeffrey Morgan
570ba41354
Filter data before
2015-04-21 13:16:47 -04:00
Dan Walsh
364287b741
Add journald as a supported logger for containers
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-04-21 12:57:54 -04:00
Alexander Morozov
371b39c26f
Merge pull request #12598 from runcom/remove-writeJSONEnv
...
Remove writeJSONEnv, fixes #12597
2015-04-21 09:54:55 -07:00
Antonio Murdaca
27811355bd
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-21 18:14:39 +02:00
Xian Chaobo
c3112adb55
add unpause after pause and add inspect node verify
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-22 00:11:27 +08:00
James Turnbull
afd5636461
Merge pull request #12563 from kentoj/patch-1
...
Clarify data volume init with existing data
2015-04-21 08:57:22 -07:00
Jeffrey Morgan
5af43a8e40
Merge pull request #420 from kitematic/fix-require
...
Fixing incorrect classNames require
2015-04-21 11:47:08 -04:00
Jeffrey Morgan
a384f09a69
fixing incorrect require
2015-04-21 11:45:27 -04:00
Evan Hazlett
55a4a7c2f2
Merge pull request #921 from hairyhenderson/inspect-format-template
...
Adding --format/-f option to inspect subcommand
2015-04-21 08:00:54 -07:00
Evan Hazlett
51044b3c3f
Merge pull request #909 from sthulb/ssh-client
...
SSH Client
2015-04-21 07:58:39 -07:00
Xian Chaobo
ac3e6d677e
bug fix
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-21 22:53:41 +08:00
Aanand Prasad
b317071cf3
Merge pull request #1205 from josephpage/run-rm-restart
...
[cli] run --rm overrides restart: always
2015-04-21 15:48:43 +01:00
Simon Thulbourn
709b0a84e3
Add SSH client
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com >
2015-04-21 15:37:09 +01:00
Evan Hazlett
191564564e
Merge pull request #995 from exoscale/fix/dont-wait-in-drivers
...
Don't let drivers wait for SSH/Docker/State
2015-04-21 07:31:12 -07:00
Evan Hazlett
f64eb09d1c
Merge pull request #1034 from frapposelli/fusion-shared-folders
...
Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
2015-04-21 07:22:15 -07:00
Aanand Prasad
bb922d63f5
Merge pull request #1318 from aanand/fix-restart-timeout
...
Fix --timeout flag on restart, add tests for stop and restart
2015-04-21 15:07:07 +01:00
Evan Hazlett
57427110a4
Merge pull request #1037 from RickWieman/1032-change-logs-for-unsupported-upgrade
...
Moves the 'stopping machine' log below error log
2015-04-21 05:34:47 -07:00
Rick Wieman
2b269c0b66
Moves the 'stopping machine' log below error log
...
Fixes #1032 .
Signed-off-by: Rick Wieman <git@rickw.nl >
2015-04-21 14:18:46 +02:00
Aanand Prasad
2291fa2d45
Fix --timeout flag on restart, add tests for stop and restart
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-21 11:59:33 +01:00
Jörg Thalheim
f731b01483
Dockerfile: download go libraries before copy vendor
...
When ever something vendor/ changes the go dependencies have to downloaded again,
which requires internet access and there for is potential slow. COPY and go install is much faster, while the git urls does not change not this often.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-21 11:41:09 +02:00
Xian Chaobo
76c8c18bc9
pause fix
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-21 16:17:32 +08:00
Vincent Bernat
9c71e647ed
drivers/softlayer: don't let the driver wait for SSH
...
Installation of curl is handled directly by libmachine provisioning, so
there is no need to do it and hence wait for SSH to be ready.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-21 07:11:41 +02:00
Vincent Bernat
fbb8898914
drivers/google: don't wait for SSH to be ready
...
Waiting for SSH is done in libmachine. There are some additional steps
after waiting for SSH but none of them seem to require SSH to be ready
to be executed.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-21 07:11:41 +02:00
Vincent Bernat
3440ba64fa
drivers/vcloudair: don't test connectivity
...
VMWare VCloudAir driver is the only one taking an extra step to test
connectivity after machine creation. If this is a desirable step, it
should be done for all drivers in libmachine directly.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-21 07:11:41 +02:00
Vincent Bernat
6f1155c2e7
drivers/openstack: don't let the driver wait for state
...
OpenStack driver waits for the machine to reach the expected state. This
is already done in libmachine for most instances of this pattern.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-21 07:11:41 +02:00
Vincent Bernat
44be16c49f
drivers: don't let the driver wait for SSH/Docker
...
Waiting for SSH to start or Docker to be available is a step done
directly in the framework (in libmachine). There is no need for the
driver to do that.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-21 07:11:41 +02:00
Olivier Gambier
1b975e980b
Merge pull request #405 from stevvooe/eventual-consistency
...
Attempt to deal with eventual consistency by retrying
2015-04-20 18:59:01 -07:00
Stephen Day
70e6ad6ef1
Merge pull request #404 from RichardScothern/digest-log
...
Add logging for generic handler errors.
2015-04-20 18:51:59 -07:00
Stephen J Day
c8345090d9
Attempt to deal with eventual consistency by retrying
...
Rather than accept the resulting of a layer validation, we retry up to three
times, backing off 100ms after each try. The thought is that we allow s3 files
to make their way into the correct location increasing the liklihood the
verification can proceed, if possible.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-04-20 18:49:22 -07:00
Jessie Frazelle
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
Richard
3a1029a262
Add logging for generic handler errors.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-04-20 17:47:52 -07:00
Alexandre Beslic
051c1fa5a8
Merge pull request #646 from chanwit/fix-const-overflow
...
Cleanup: cast int64 to make it works everywhere
2015-04-20 17:44:29 -07:00
Tianon Gravi
e562495d56
Merge pull request #12181 from inatatsu/enable-netgo-with-gccgo
...
Enable "netgo" library when we build with gccgo
2015-04-20 17:31:49 -07:00
Jessie Frazelle
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
Jessie Frazelle
82f75df9e9
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
2015-04-20 17:27:17 -07:00
Jessie Frazelle
874d64e690
Merge pull request #12517 from mavenugo/master
...
Enhanced port integration-cli tests
2015-04-20 17:26:48 -07:00
Jessie Frazelle
4bb8924b52
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
2015-04-20 17:26:09 -07:00
Jessica Frazelle
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
Jessie Frazelle
4a25c5d25b
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
2015-04-20 17:02:43 -07:00
David Lawrence
8a7f02c046
fixing vet
2015-04-20 17:02:11 -07:00
Jessie Frazelle
e1fd7e25de
Merge pull request #12566 from fntlnz/remove-go1.3.3-support
...
Removed go1.3.3 support
2015-04-20 17:01:57 -07:00
Jessie Frazelle
df217120cd
Merge pull request #12471 from coolljt0725/fix_weird_output_format
...
Fix weird terminal output format
2015-04-20 17:01:02 -07:00
Dave Henderson
9af46e245f
Changing template function name from prettyJSON to prettyjson
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-20 19:49:47 -04:00
Jessie Frazelle
fcacb1793e
Merge pull request #12568 from duglin/TweakConfigPerms
...
Make .docker dir have 0700 perms not 0600
2015-04-20 16:33:10 -07:00
Jessie Frazelle
23ec4cab60
Merge pull request #12556 from icecrime/update_release_checklist
...
Update release checklist
2015-04-20 16:31:40 -07:00
Dave Henderson
d40d18f9a8
Making sure all properties are available
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-20 19:27:38 -04:00
Dave Henderson
c93a17481c
Adding --format/-f option to inspect subcommand
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-20 19:27:38 -04:00
Dave Henderson
ee41dc36df
Adding github.com/stretchr/testify/assert to Godeps
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-04-20 19:27:38 -04:00