Sven Dowideit
dd93845ad0
Merge pull request #6056 from ipbabble/master
...
Made fixes to man pages to remove some ambiguities and typos
2014-06-02 18:01:22 -07:00
unclejack
a8ade72b6a
Merge pull request #6168 from vieux/add_proto_validation
...
add proto validation at parse
2014-06-03 03:55:41 +03:00
Victor Marmol
70b778751e
Merge pull request #6153 from vishh/stats1
...
Add per cpu usage to libcontainer stats
2014-06-02 17:53:17 -07:00
Victor Vieux
4e7254840b
Add redirect and env proxy support to docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-03 00:46:06 +00:00
Victor Vieux
98d7b720c2
Merge pull request #6169 from vieux/add_volumes_inspect_back
...
add volumes back to inspect
2014-06-02 17:07:00 -07:00
Victor Vieux
996133b9ba
add volumes back to inspect
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-03 00:05:54 +00:00
Victor Vieux
0633b12b28
add proto validation at parse
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 23:03:10 +00:00
Victor Vieux
b292928cd5
Merge pull request #5848 from unclejack/resumable_pulls
...
resume pulling the layer on disconnect
2014-06-02 14:07:01 -07:00
Victor Vieux
dcba54aa99
Merge pull request #6166 from vieux/debug_skipping
...
switch skipping from error to debug
2014-06-02 14:01:49 -07:00
Victor Vieux
af6ab357e8
switch skipping from error to debug
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 20:47:07 +00:00
unclejack
aa61cc759b
Merge pull request #6165 from vieux/update_tests
...
Update tests regarding busybox & inspect
2014-06-02 23:39:12 +03:00
Vincent Batts
3a4e3ca327
filters: don't encode an empty set. update comments
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
89a15fa235
filters: use json marshal, instead of beam/data
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
3ecfaa8f2d
filters: change untagged to dangling
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
f322168563
server: very debug.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:52 -04:00
Vincent Batts
f1cc7ce5d7
filter flag: split out for separate --filter flags
...
adding tests and allowing for easy passing of filters.Args from client
to server.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
3391aac2b2
images: fix markdown documentation
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
cb7857de5d
images filter: remove the redundant inverted filter
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
babd572015
filters: cleanup & fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
55d95185ed
filters, for images: docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:51 -04:00
Vincent Batts
caf9b19b0c
filters: remove out filter proc prototype
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:50 -04:00
Vincent Batts
5f3812ec97
filters, for images: start with untagged/tagged boolean
...
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
example like: docker rmi $(docker images -q --filter 'untagged=true')
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-06-02 16:33:50 -04:00
Victor Vieux
730d9ba174
fix busybox image detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 19:57:20 +00:00
Victor Vieux
b8932abcd3
pull only busybox:latest
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-02 19:54:17 +00:00
LK4D4
ae128437ce
Move build cache tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 23:40:14 +04:00
LK4D4
bf4d907092
More verbose build tests
...
I've decided that custom asserts only hide the meaning of tests
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 23:40:13 +04:00
LK4D4
2e85568816
Aux functions for build testing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 23:40:13 +04:00
Sven Dowideit
afb2d5de3d
Merge pull request #6159 from SvenDowideit/s3-json-fixup
...
aws json is not javascript style json. trailing comma breaks it :(
2014-06-02 12:28:57 -07:00
Victor Vieux
55230b3332
Merge pull request #6138 from NERSC/6092-setuidrace
...
Fix for setuid race condition in LXC driver
2014-06-02 12:16:00 -07:00
Victor Vieux
c136384b20
Merge pull request #6160 from crosbymichael/update-test-for-nil-error
...
Update cpu stat test for no error
2014-06-02 12:12:49 -07:00
Victor Vieux
24ea088124
Merge pull request #6147 from cyphar/6142-mflag-strip-quotes-long-equal-form
...
mflag: strip quotes in certain forms from flag values
2014-06-02 12:03:58 -07:00
Michael Crosby
3e13aaec00
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
2014-06-02 12:03:11 -07:00
Victor Vieux
43b7af1dd1
Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
...
Remove unused and racy "used" param from streamformatter
2014-06-02 11:56:05 -07:00
Michael Crosby
30fdac2cb1
Update cpu stat test for no error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-02 11:54:23 -07:00
Michael Crosby
f1a217be0f
Merge pull request #6116 from vishh/nsinit_stats
...
Adding "stats" and "spec" option to nsinit CLI
2014-06-02 11:44:37 -07:00
unclejack
2a1b7f222a
resume pulling the layer on disconnect
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-06-02 21:41:22 +03:00
SvenDowideit
cac24bbfaf
aws json is not javascript style json. trailing comma breaks it :(
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-03 04:30:32 +10:00
James Turnbull
d3ff00948f
Merge pull request #6157 from SvenDowideit/pr_out_update_networking_md
...
Update networking.md
2014-06-02 13:46:26 -04:00
Alexandr Morozov
1ae37cef91
Remove unused and racy "used" param from streamformatter
...
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-02 21:43:07 +04:00
Andre Dublin
4ac216d8d3
Update networking.md
...
grammar
Docker-DCO-1.1-Signed-off-by: Andre Dublin <81dublin@gmail.com > (github: andredublin)
rebased by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-03 03:41:53 +10:00
Sven Dowideit
2404ce3d26
Merge pull request #6154 from SvenDowideit/pr_out_adding_user_guide
...
Adding User Guide
2014-06-02 10:39:15 -07:00
Solomon Hykes
84798081a4
Add contribution guidelines
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
2014-06-02 11:28:15 +00:00
cpuguy83
c2f2fc0385
Update shipyard backend to use beam
2014-06-02 11:18:09 +00:00
Aanand Prasad
032972586b
Aggregator backend
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2014-06-02 11:12:22 +00:00
Ben Firshman
a8e5a8e564
Output /containers/json in correct format
...
Not complete, but enough to keep `docker ps` happy.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-06-02 10:38:27 +00:00
Solomon Hykes
5f778efac1
Merge pull request #57 from cpuguy83/add_custom_port_to_dockerserver
2014-06-08 14:30:35 -07:00
Brian Goff
0c211a107b
Allow configurable server binding
2014-06-08 13:08:22 -07:00
Solomon Hykes
dd33da7c47
Merge pull request #54 from philips/change-apiserver-name
...
backends: rename apiserver to dockerserver
2014-06-07 23:40:57 -07:00
Brandon Philips
a04fa6d252
backends: rename apiserver to dockerserver
...
afaics this should be called dockersever as in the readme.
2014-06-07 23:15:24 -07:00
Solomon Hykes
f67c1b7e4b
Merge pull request #49 from smarterclayton/add_websocket_server
2014-06-07 21:02:54 -07:00