Andrea Luzzardi
747a83a40a
store: Cleanup initializers.
...
- KV is now Backend
- name (string) is now backend (Backend)
- initializers are now a static var rather than generated by init()
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-14 21:32:10 -07:00
Dave Henderson
7b68762d36
Adding new DOCKER_MACHINE_NAME environment variable
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-05-14 22:43:39 -04:00
Qiang Huang
6e19912df9
Enhance check-config.sh
...
Currently check-config.sh just said enable or missing, when I used
a fresh kernel, made check-config.sh happy, still can't start
container. It take me days debuging kernel and Docker and finally
found it's because I enabled some CONFIGs as modules and never
loaded these modules.
So I think it's necessary to let check-config.sh told users which
configs are enabled as modules.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-15 10:20:31 +08:00
Daniel Nephin
c8022457eb
Merge pull request #1413 from aanand/update-dockerpty
...
Update dockerpty to 0.3.3
2015-05-14 21:23:46 -04:00
Alexandre Beslic
77884de123
Merge pull request #793 from aluzzardi/lock-channel
...
store: Lock returns a channel that is closed if the lock is lost
2015-05-14 17:55:09 -07:00
Andrea Luzzardi
23481131c4
store: Add a channel to lock that is closed if our lock is lost or an error.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-14 17:35:57 -07:00
Victor Vieux
b261ce5fb0
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882 .
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-14 17:31:45 -07:00
Andrea Luzzardi
250a17e954
Merge pull request #780 from abronan/improve_helpers
...
Refactor helpers for storage key formatting
2015-05-14 17:02:58 -07:00
David Calavera
e4855eebf2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
2015-05-14 16:49:01 -07:00
John Howard
35cdcbb323
Windows: No ZFS graphdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 15:57:45 -07:00
Victor Vieux
2cb0395acf
remove images by name or ID, not always ID
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-14 15:22:06 -07:00
Tibor Vass
c5240d79e3
Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor
...
Windows: Start of daemon config refactor
2015-05-14 14:55:22 -07:00
Xian Chaobo
b89d07a1cf
add rmi without tag integration test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-14 14:44:35 -07:00
Evan Hazlett
bc0a552b26
Merge pull request #1162 from hairyhenderson/bats-arm-support
...
Naming the binary properly on ARM when running integration tests
2015-05-14 16:37:42 -04:00
Brian Goff
a4592467e7
Merge pull request #13223 from Microsoft/10662-loggers
...
Windows: Factor out syslog and journald
2015-05-14 16:26:43 -04:00
Aanand Prasad
9bbf1a33d1
Update dockerpty to 0.3.3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-05-14 20:03:50 +01:00
Alexander Morozov
b2ad9314a2
Merge pull request #13196 from crosbymichael/update-libocntainer-may13
...
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
2015-05-14 10:49:25 -07:00
Alexandre Beslic
b95e826b08
Merge pull request #789 from kelseyhightower/master
...
discovery: improve code comments.
2015-05-14 10:34:40 -07:00
John Howard
655a58e27b
Windows: Factor out syslog and journald
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 10:34:09 -07:00
Doug Davis
a85ca8b7c4
add link between -D and --log-level=debug back in
...
Due to popular demand :-)
See #11965
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-14 10:29:49 -07:00
John Howard
b7ee717a10
Windows: Refactor sysinfo for compilation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 09:44:51 -07:00
vagrant
d2a2c974d9
fix to gccgo compilation error
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-05-14 16:28:23 +00:00
Kelsey Hightower
0d87489773
discovery: improve code comments.
...
Signed-off-by: Kelsey Hightower <kelsey.hightower@gmail.com >
2015-05-14 08:49:40 -07:00
Alexander Morozov
fe6f77df2c
Merge pull request #13087 from duglin/FixNatTest
...
Fix random errors in DockerSuite.TestNetworkNat
2015-05-14 08:35:27 -07:00
Aanand Prasad
0ac8c3cb03
Merge pull request #858 from dnephin/fix_volumes_recreate_on_1.4.1
...
Preserve individual volumes on recreate
2015-05-14 16:12:08 +01:00
Brian Goff
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
Evan Hazlett
bf8eaea8ac
Merge pull request #1096 from ibuildthecloud/rancheros
...
Support RancherOS, Fixes #992
2015-05-14 10:02:30 -04:00
Doug Davis
1c5a4728e1
Merge pull request #13208 from ahmetalpbalkan/nit
...
Remove out of date comment
2015-05-14 06:59:21 -07:00
Doug Davis
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
Daniel Nephin
d5c9626040
Merge pull request #1411 from aanand/fix-extends-docs
...
Fix typo in extends.md
2015-05-14 09:53:38 -04:00
Günter Zöchbauer
ef956253d8
Add bwu_docker to the list.
...
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com >
2015-05-14 15:27:51 +02:00
Aanand Prasad
ad9c5ad938
Fix typo in extends.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-05-14 10:48:35 +01:00
Ahmet Alp Balkan
999f464feb
Parse input timestamps with standard RFC3339
...
Fix for #13175 .
This change allows user-input timestamps (e.g. to `docker events
--since/--until` or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).
User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.
Added test case for `events --since/--until` with all possible
timestamp input formats.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-14 07:44:42 +00:00
Ahmet Alp Balkan
9448d3627b
Remove out of date comment
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-14 07:37:31 +00:00
Evan Hazlett
d56cc66274
Merge pull request #1171 from nathanleclaire/fixup_cert_copy
...
Fix cert copying bug [URGENT]
2015-05-14 02:26:56 -04:00
Alexandre Beslic
9d68cc0506
Merge pull request #787 from aluzzardi/store-options-as-ptr
...
pkg/store: Pass Options as pointer, not value.
2015-05-13 23:09:37 -07:00
Ankush Agarwal
9bfe6f0d24
Update Configuring and running Docker article
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-05-14 07:45:20 +02:00
Sankar சங்கர்
cb4d47ddb3
Copied info about google groups, IRC, etc. to README.md from CONTRIBUTORS.md
...
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com >
2015-05-14 11:12:20 +05:30
Nathan LeClaire
8afddbeab8
Fix cert copying bug
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-05-13 22:19:27 -07:00
Sebastiaan van Stijn
1d57642906
Merge pull request #11706 from HuKeping/time
...
Fix inconsistent date formats in API
2015-05-13 20:23:19 -07:00
Hu Keping
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
Chen Hanxiao
3957cc8022
gitignore: add *.rej
...
Ignore noise from unsuccessful patch operation.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-05-13 22:10:26 -04:00
Andrea Luzzardi
ece52698d6
Merge pull request #783 from vieux/fix_image_match
...
fix image.Match to take only repo or repo:tag
2015-05-13 19:05:30 -07:00
Andrea Luzzardi
04f7d2ac10
pkg/store: Remove unsused ErrSessionUndefined from consul.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-13 19:01:01 -07:00
Andrea Luzzardi
9d055d6bf8
pkg/store: Pass Options as pointer, not value.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-13 19:00:39 -07:00
Sebastiaan van Stijn
ed25742002
Merge pull request #12667 from ibuildthecloud/host-uts
...
Add --uts=host to allow sharing the UTS namespace
2015-05-13 18:30:32 -07:00
Alexandre Beslic
a73c89d42b
remove bool argument from getDirectory
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-13 18:05:47 -07:00
Sven Dowideit
0645b13498
One more thing that kitematic helps with
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
2015-05-14 11:04:41 +10:00
Alexandre Beslic
ccf6e37c16
Refactor helpers to be more meaningful and flexible for future store usage
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-05-13 18:02:48 -07:00
Victor Vieux
4da6b2b093
Merge pull request #551 from noxiouz/fix_eventsHandler
...
[eventsHandler] Use Lock/Unlock to sync a write access
2015-05-13 17:58:52 -07:00