Evan Hazlett
97aaf4e05d
Merge pull request #427 from ehazlett/remove-azure-name
...
remove name option from azure driver
2015-01-28 11:10:42 -05:00
Evan Hazlett
9b55d4f0a9
Merge pull request #426 from sthulb/virtualbox-state
...
Remove $ from regexp for Windows users
2015-01-28 11:10:22 -05:00
Evan Hazlett
b731c0ea28
remove name option from azure driver
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-01-28 10:45:32 -05:00
Simon Thulbourn
1727123214
Remove $ from regexp
...
The GetState() func now works on Windows hosts
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com >
2015-01-28 15:41:47 +00:00
Tibor Vass
c575cc697e
Merge pull request #10403 from stevvooe/v2-status-code-narrow
...
Open up v2 http status code checks for put and head checks
2015-01-28 09:38:45 -05:00
Solomon Hykes
c1f3fe70df
Merge pull request #9137 from shykes/contribution-docs
...
Improve project organization
2015-01-28 01:19:29 -08:00
Phil Estes
0c8d17b5c1
Fix bridge initialization for IPv6 if IPv4-only docker0 exists
...
This fixes the daemon's failure to start when setting --ipv6=true for
the first time without deleting `docker0` bridge from a prior use with
only IPv4 addressing.
The addition of the IPv6 bridge address is factored out into a separate
initialization routine which is called even if the bridge exists but no
IPv6 addresses are found.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-01-27 23:54:26 -05:00
James Turnbull
8d49ebd338
Merge pull request #10408 from estesp/fix-ipv6-docs
...
Fix incorrect IPv6 addresses/subnet notations in docs
2015-01-27 23:24:52 -05:00
Daniel Nephin
d79dc85fa5
Merge pull request #887 from albers/multiple-configfiles
...
Bash completion supports fig.yml and other legacy filenames
2015-01-27 23:08:23 -05:00
Phil Estes
5945de43b0
Fix incorrect IPv6 addresses/subnet notations in docs
...
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-01-27 22:45:43 -05:00
Andrea Luzzardi
de67d96532
Dockerfile: Build swarm with vendored dependencies.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-27 18:32:07 -08:00
Alexander Morozov
8893dee098
Merge pull request #10404 from liusdu/liu-dev
...
fix a minor typo in daemon/container.go
2015-01-27 18:26:40 -08:00
Derek McGowan
629815b424
Buffer tar file on v2 push
...
fixes #10312
fixes #10306
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-01-27 18:11:05 -08:00
Stephen J Day
86aea582b6
Open up v2 http status code checks for put and head checks
...
Under certain cases, such as when putting a manifest or check for the existence
of a layer, the status code checks in session_v2.go were too narrow for their
purpose. In the case of putting a manifest, the handler only cares that an
error is not returned. Whether it is a 304 or 202 does not matter, as long as
the server reports success. Having the client only accept specific http codes
inhibits future protocol evolution.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-01-27 18:09:53 -08:00
Victor Vieux
86a028d7c1
Merge pull request #317 from aluzzardi/godep
...
Vendoring dependencies with godep.
2015-01-27 18:08:34 -08:00
Andrea Luzzardi
bacf1ee849
Vendoring: Freeze dependencies.
...
Generated by: godep save ./...
Fixes #264
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-27 18:06:15 -08:00
Andrea Luzzardi
ae3b1cfac9
travis: Restore dependencies using godep.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-27 18:06:13 -08:00
Sven Dowideit
de52a1998d
Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks
...
tell users they can what IP range Hub webhooks can come from so they can...
2015-01-28 11:55:09 +10:00
Liu Hua
71f8b09543
fix a minor typo in daemon/container.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-01-28 09:54:40 +08:00
James Turnbull
196cdf1450
Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc
...
Add the registry mirror document to the menu
2015-01-27 20:29:25 -05:00
Andrea Luzzardi
23302fca3e
travis: Exclude Godeps from gofmt validation.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-01-27 17:16:46 -08:00
Stephen Day
1650088629
Merge pull request #77 from ahmetalpbalkan/TestStatCall-fix
...
Allow modtime to be a few seconds off on TestStatCall
2015-01-27 17:07:28 -08:00
Sven Dowideit
1d04cc513a
Add the registry mirror document to the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2015-01-28 10:47:11 +10:00
Michael Crosby
b3402f34b2
Merge pull request #10322 from dmcgowan/v2-manifest-tarsum-cache
...
V2 manifest tarsum cache
2015-01-27 16:40:49 -08:00
Alexander Morozov
667dc58c39
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
...
This needed for our "small" testing daemon using same config as "big"
testing daemon.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-01-27 16:40:11 -08:00
James Turnbull
3ac5596fe0
Merge pull request #10369 from mcfiredrill/etc-host-typo
...
fix /etc/host typo in remote API docs
2015-01-27 18:35:16 -05:00
James Turnbull
b2b284b5cd
Merge pull request #10373 from chenhanxiao/docker-build-typo
...
docs: fix a typo in docker-build man page
2015-01-27 18:25:55 -05:00
Alexander Morozov
e54d162941
Merge pull request #10371 from jlhawn/fix_build_output_10364
...
Fix premature close of build output on pull
2015-01-27 15:09:17 -08:00
Victor Vieux
45c1efd2c5
Merge pull request #318 from vieux/fix_status_code
...
add missing status codes
2015-01-27 14:37:09 -08:00
Victor Vieux
ad8f7facf7
add missing status codes
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-01-27 14:28:54 -08:00
Ahmet Alp Balkan
51042da7fb
Modify TestStatCall to check if ModTime is increasing
...
Also removed ModTime checks on directories as it is not
required and some drivers might fail to provide it.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-01-27 14:28:43 -08:00
Olivier Gambier
769df8dabe
Merge pull request #109 from AndreyKostov/storagedriver-s3-rotating-buffer
...
Add a rotating buffer functionality to the s3 driver
2015-01-27 14:27:24 -08:00
Stephen Day
fd37df55ff
Merge pull request #111 from ahmetalpbalkan/inmemory-fix
...
update modtime on WriteAt for inmemory driver
2015-01-27 14:26:14 -08:00
Ahmet Alp Balkan
bf49cad662
Update modtime on WriteAt for inmemory driver
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-01-27 14:05:36 -08:00
Jeffrey Morgan
475654e42c
Merge branch 'master' into container-dropdowns
...
Conflicts:
app/ContainerDetails.react.js
app/ContainerModal.react.js
app/styles/main.less
2015-01-27 17:05:11 -05:00
Jeffrey Morgan
5162934794
Merge branch 'master' into container-dropdowns
...
Conflicts:
app/ContainerDetails.react.js
app/ContainerModal.react.js
app/styles/main.less
2015-01-27 17:05:11 -05:00
Alexander Morozov
8f7cf87fd9
Merge pull request #10383 from cpuguy83/update_m2dman
...
Update go-md2man
2015-01-27 13:59:58 -08:00
Aanand Prasad
22aca1a8a5
Merge pull request #879 from albers/bash-completion
...
Update bash completion for compose 1.1.0-rc1
2015-01-27 16:34:33 -05:00
Aanand Prasad
74302560f5
Merge pull request #891 from aanand/fix-image-volumes-test
...
Fix test for image-declared volumes
2015-01-27 16:33:59 -05:00
Aanand Prasad
bc2f6044fd
Merge pull request #880 from dnephin/use_latest_docker_py
...
Use latest docker-py
2015-01-27 16:32:56 -05:00
Andrey Kostov
c05e4682f8
Add a rotating buffer functionality to the s3 driver
2015-01-27 13:24:17 -08:00
Jeffrey Morgan
fba00223a2
Merge pull request #166 from kitematic/jmorgan-preferences
...
Adding preferences pane
2015-01-27 16:13:47 -05:00
Jeffrey Morgan
29c96bc0d5
Merge pull request #166 from kitematic/jmorgan-preferences
...
Adding preferences pane
2015-01-27 16:13:47 -05:00
Jeffrey Morgan
86afb4d253
Removing unnecessary logging
2015-01-27 16:09:26 -05:00
Jeffrey Morgan
c741b0bf1f
Removing unnecessary logging
2015-01-27 16:09:26 -05:00
Sean Li
a671c11f2f
Displays ports and volumes dropdown.
2015-01-27 13:02:58 -08:00
Sean Li
b484233d4c
Displays ports and volumes dropdown.
2015-01-27 13:02:58 -08:00
Jeffrey Morgan
05d0f5a740
Menu + Preferences
2015-01-27 15:47:30 -05:00
Jeffrey Morgan
e16b32965f
Menu + Preferences
2015-01-27 15:47:30 -05:00
Victor Vieux
0c446154d4
Merge pull request #315 from aluzzardi/redmon-demo-affinity
...
Add affinity to the redmon demo.
2015-01-27 12:38:14 -08:00