Evan Hazlett
db3343ea70
Merge pull request #255 from ehazlett/standard-tls
...
Use standard TLS for authentication
2015-01-20 13:12:44 -05:00
Alexander Morozov
b2fe1b3dd9
Merge pull request #10155 from tianon/netgo-take-three
...
Let's try fixing "netgo" again
2015-01-20 09:45:42 -08:00
Evan Hazlett
e91fa6b447
more docs for machine
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-20 12:21:43 -05:00
Evan Hazlett
54b3e4ddbf
updated docs for machine using tls
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-20 12:04:59 -05:00
Vincent Batts
06da161aee
Merge pull request #10204 from vbatts/vbatts-dm_info_docs
...
devmapper: some explination of `docker info`
2015-01-20 09:41:25 -05:00
Chanwit Kaewkasi
bf852ec243
update expression syntax in doc
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 15:45:38 +07:00
Chanwit Kaewkasi
3c147df81a
remove unsupported operators
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 15:45:36 +07:00
Chanwit Kaewkasi
e4db376a6d
support affinity and validate key and value properly
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 15:44:55 +07:00
Chanwit Kaewkasi
45b7f26394
refactor matching into filter/utils.go
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:42:23 +07:00
Jessica B. Hamrick
11ebdb050c
Fix the scheduling bug, fixes #253
...
Signed-off-by: Jessica B. Hamrick <jhamrick@berkeley.edu >
2015-01-19 19:19:35 -08:00
Jessica B. Hamrick
f942cb2e69
Add test that fails to execute the proper strategy
...
Signed-off-by: Jessica B. Hamrick <jhamrick@berkeley.edu >
2015-01-19 19:19:32 -08:00
Chanwit Kaewkasi
d77c9596b1
add double equals comparison
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:04:19 +07:00
Chanwit Kaewkasi
7ee722b2d7
support relative comparisons in constraints
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:03:34 +07:00
Chanwit Kaewkasi
d335f59757
implement alternative negation syntax
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:02:13 +07:00
Chanwit Kaewkasi
25231f3bb3
fix test failed per rebase #228
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:02:12 +07:00
Chanwit Kaewkasi
5b973d0057
improve to allow optional matching with case-insensitivity
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:02:10 +07:00
Chanwit Kaewkasi
b4a7abdc83
add a testcase for escape regexp
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:02:09 +07:00
Chanwit Kaewkasi
790b1ea45d
cleanup and add comments
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:02:07 +07:00
Chanwit Kaewkasi
564cca1a22
explain expression syntax in README
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:02:05 +07:00
Chanwit Kaewkasi
54c7c12d05
improve regexp matching
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:00:48 +07:00
Chanwit Kaewkasi
37e10e9656
support not in constraints expressions
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-01-20 10:00:12 +07:00
Tianon Gravi
2feb2d07b6
Merge pull request #10189 from crosbymichael/update-libcontainer-jan16
...
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
2015-01-19 19:33:40 -07:00
Fred Lifton
e6a70a6f81
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
2015-01-19 18:12:50 -08:00
Vincent Batts
cb81ed34a5
devicemapper: API for checking cookie support
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-01-19 20:35:20 -05:00
Michael Crosby
7b48488c56
Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links
...
LXC needs stdin for container to remain up
2015-01-19 17:13:37 -08:00
Victor Vieux
829bcb562d
fix SWARM_DISCOVERY env var
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-20 01:12:10 +00:00
Michael Crosby
1efc940e6f
Merge pull request #10124 from duglin/Issue10034
...
Add the list of possible values for --log-level to help text
2015-01-19 17:09:18 -08:00
Michael Crosby
f49fb25375
Merge pull request #10061 from brahmaroutu/env_ports_9900
...
Env Variables created for each of the ports in addition to env variables...
2015-01-19 16:56:47 -08:00
Phil Estes
93d51e5e97
Clean up localhost resolv logic and add IPv6 support to regexp
...
Addresses #5811
This cleans up an error in the logic which removes localhost resolvers
from the host resolv.conf at container creation start time. Specifically
when the determination is made if any nameservers are left after
removing localhost resolvers, it was using a string match on the word
"nameserver", which could have been anywhere (including commented out)
leading to incorrect situations where no nameservers were left but the
default ones were not added.
This also adds some complexity to the regular expressions for finding
nameservers in general, as well as matching on localhost resolvers due
to the recent addition of IPv6 support. Because of IPv6 support now
available in the Docker daemon, the resolvconf code is now aware of
IPv6 enable/disable state and uses that for both filter/cleaning of
nameservers as well as adding default Google DNS (IPv4 only vs. IPv4
and IPv6 if IPv6 enabled). For all these changes, tests have been
added/strengthened to test these additional capabilities.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-01-19 19:35:55 -05:00
Jeffrey Morgan
78762de6a6
Container Store per-container emits
2015-01-19 19:33:23 -05:00
Jeffrey Morgan
b2d319edcb
Container Store per-container emits
2015-01-19 19:33:23 -05:00
Jessica Frazelle
7bb4b56cf9
Add docs for --memory-swap.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2015-01-19 16:17:58 -08:00
Sven Dowideit
04d1b93fce
Merge pull request #10170 from thaJeztah/docs-note-environment-vars
...
Document that ENV vars are not automatically updated
2015-01-20 10:04:25 +10:00
Sven Dowideit
e08858a80d
Merge pull request #10175 from fossilet/patch-1
...
Add usage of port mapping for Boot2docker.
2015-01-20 10:03:32 +10:00
James Turnbull
826e0beade
Merge pull request #10192 from icecrime/9951_client_proxy_doc
...
Add documentation for HTTP proxies
2015-01-19 18:55:25 -05:00
Tibor Vass
50ff27caa1
Merge pull request #9826 from icecrime/8318_whitespace_add_copy
...
Support whitespace in paths for ADD and COPY
2015-01-19 18:37:53 -05:00
Stephen Day
4dcc892bf2
Merge pull request #81 from AndreyKostov/storagedriver-s3-fix-param
...
Fix regionName parameter so as to not have a panic when it is not a string
2015-01-19 15:29:36 -08:00
Victor Vieux
59fb880b75
emitCustomEvent -> emitEvent
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-19 22:38:42 +00:00
Victor Vieux
08a17cd2e6
Merge pull request #230 from mountkin/master
...
restart the event monitor when unhealthy node comes back
2015-01-19 14:37:51 -08:00
Vincent Batts
a09a665d99
devmapper: some explination of docker info
...
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com >
2015-01-19 17:37:08 -05:00
Andrey Kostov
671c69e0df
Fix regionName parameter so as to not have a panic when it is not a string
2015-01-19 14:23:28 -08:00
Vincent Batts
4cfe9df0a9
devicemapper: debug output specifics
...
moar information for the information gods
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-01-19 17:21:10 -05:00
Vincent Batts
dbb642b7fb
devicemapper: define the fallback flag
...
DM_UDEV_DISABLE_LIBRARY_FALLBACK is disabled by most applications today
when using device-mapper, and ensuring that device-mapper is in sync
with udev. This flag instructs devicemapper to not fallback to creating
the device nodes itself. In the case of udev sync not being supported,
devicemapper will attempt to create the devices in a timely manner,
regardless of udev.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-01-19 17:06:53 -05:00
Andrea Luzzardi
944ac685ef
Merge pull request #249 from vieux/docker_images
...
Proposal: Simple docker images support
2015-01-19 14:06:47 -08:00
unclejack
2d61a62378
Merge pull request #10195 from vbatts/vbatts-dm_udev_sync
...
device-mapper udev sync
2015-01-20 00:06:29 +02:00
Victor Vieux
741c2848f4
add docker images support
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-19 22:02:32 +00:00
Andrea Luzzardi
1e92f854d5
Merge pull request #243 from vieux/affinity
...
add affinity (start next to a container/image)
2015-01-19 14:02:03 -08:00
Jessie Frazelle
9b4cd01b21
Merge pull request #9730 from cpuguy83/9709_fix_volumes_from_missing_container
...
Fix volumes-from re-applying on each start
2015-01-19 14:00:53 -08:00
Victor Vieux
1dfb7ffb70
add untag and delete
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-19 21:58:46 +00:00
Victor Vieux
110c3b6c39
Merge pull request #236 from aluzzardi/state-store
...
Store requested state persistently.
2015-01-19 13:43:11 -08:00