Tibor Vass
76aefc18f9
Merge pull request #21691 from tonistiigi/fix-gccgo-make
...
Fix building gccgo from makefile
2016-04-06 17:31:59 -04:00
Alexander Morozov
3f358aeaca
integration-cli: try to make TestEventsTimestampFormats less flaky
...
Fix #21749
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-04-06 14:31:39 -07:00
Richard Scothern
e4817cfc94
Remove ListAllMyBuckets from the S3 permission scope.
...
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-04-06 14:22:08 -07:00
Sebastiaan van Stijn
d82e522e36
Merge pull request #21810 from aboch/vnd
...
Vendoring libnetwork v0.7.0-rc.4
2016-04-06 14:18:33 -07:00
Alexander Morozov
65464d11f1
Merge pull request #21809 from Microsoft/jjh/tp4removal
...
Windows: Remove TP4 support from main codebase
2016-04-06 14:11:33 -07:00
Ying Li
f8c42e4cbf
NotaryRepository.Update now just returns an error, rather than a client
...
an error, because we don't actually use the client anymore.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-06 14:08:08 -07:00
Stefan J. Wernli
818a5198e4
Adding postRunProcessing infrastructure for hanlding Windows Update.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2016-04-06 14:03:05 -07:00
Stefan J. Wernli
ef5bfad321
Adding readOnly parameter to graphdriver Create method
...
Since the layer store was introduced, the level above the graphdriver
now differentiates between read/write and read-only layers. This
distinction is useful for graphdrivers that need to take special steps
when creating a layer based on whether it is read-only or not.
Adding this parameter allows the graphdrivers to differentiate, which
in the case of the Windows graphdriver, removes our dependence on parsing
the id of the parent for "-init" in order to infer this information.
This will also set the stage for unblocking some of the layer store
unit tests in the next preview build of Windows.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2016-04-06 13:52:53 -07:00
Phil Estes
1771d35b48
Don't perform external setkey when net==host
...
This else case was lost in the migration from native execdriver to OCI
implementation via runc. There is no need to have external setkey when
--net=host.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2016-04-06 16:45:43 -04:00
John Howard
ccd0da908a
Windows: Fix failing unit tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-04-06 13:42:15 -07:00
Joffrey F
3ef6b17bfc
Use docker-py 1.8.0
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-04-06 13:28:45 -07:00
Phil Estes
40dc921da2
Merge pull request #21805 from LK4D4/unused_stuff
...
all: remove some unused funcs and variables
2016-04-06 16:27:14 -04:00
Vincent Demeester
5709f8e422
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
2016-04-06 22:14:14 +02:00
Tibor Vass
02297d5a33
Merge pull request #21794 from coolljt0725/cleanipc_quiet
...
Don't throw error on clenaup ipc mounts if it does not exists
2016-04-06 16:10:53 -04:00
Sebastiaan van Stijn
2bbe75cdb6
Merge pull request #21783 from vieux/fix_21772
...
do not trim one char from {{.Names}} each time it is used in --format
2016-04-06 13:01:22 -07:00
Tibor Vass
8c361eb5da
Merge pull request #21723 from devimc/master
...
Fix compilation errors with btrfs-progs-4.5
2016-04-06 15:56:42 -04:00
Tibor Vass
6bd429cb2a
Merge pull request #21802 from tiborvass/carry-21716
...
Carry 21716: When container had no layer data, cleanupContainer crashed
2016-04-06 15:21:38 -04:00
Alessandro Boch
8a957bafa5
Vendoring libnetwork v0.7.0-rc.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2016-04-06 12:18:21 -07:00
John Howard
331c8a86d4
Windows: Remove TP4 support from main code
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-04-06 12:12:20 -07:00
French Ben
5f1a7833a1
added comment for error
...
Signed-off-by: French Ben <me+git@frenchben.com >
2016-04-06 11:41:58 -07:00
Victor Vieux
e7077ff5e3
Merge pull request #2074 from allencloud/log-err-when-remove-fails-in-rescheduling
...
log err when remove container fails in rescheduling
2016-04-06 11:13:05 -07:00
Brian Goff
40ccb7114e
Merge pull request #21768 from shishir-a412ed/fix_docker_run
...
Ignore os.IsNotExist errors when calling ToDiskLocking
2016-04-06 14:12:38 -04:00
Victor Vieux
68ade49ada
do not trim one char from {{.Names}} each time it is used in --format
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-04-06 11:04:13 -07:00
Alexander Morozov
27f50c40e6
Merge pull request #21804 from mlaventure/arm-fix
...
Skip migration unit test on non amd64 platform
2016-04-06 11:01:23 -07:00
Tibor Vass
a79e79c58e
Merge pull request #21780 from sanimej/libn-v0.7rc2
...
Vendor Libnetwork v0.7.0-rc.3
2016-04-06 13:54:21 -04:00
Alexander Morozov
5ee8652a21
all: remove some unused funcs and variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-04-06 10:40:01 -07:00
Sebastiaan van Stijn
636e7760e2
Merge pull request #21787 from npcode/fix-docs-plugin-api-markdown
...
Fix incorrect markdown rendering
2016-04-06 10:18:11 -07:00
Sebastiaan van Stijn
3d800dc019
Merge pull request #21712 from yongtang/21335-docs-container-with-volumes
...
Remote API docs give incorrect example for creating a container with volumes.
2016-04-06 10:15:37 -07:00
Kenfe-Mickael Laventure
cf73ebf280
Skip migration unit test on non amd64 platform
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-04-06 10:10:58 -07:00
Sebastiaan van Stijn
bbcbed3b54
Merge pull request #21799 from coolljt0725/fix_docs
...
Correct the description of --group-add in run.md
2016-04-06 10:02:32 -07:00
Sebastiaan van Stijn
0e5694412b
Merge pull request #21790 from thaJeztah/carry-21241-explain-build-cache
...
[carry 21241] explain the impact on build caching more clearly
2016-04-06 10:00:11 -07:00
Daniel Nephin
958f96c78a
Merge pull request #3269 from dnephin/fix_logs_and_scale_down
...
Prevent unnecessary inspection of containers
2016-04-06 12:45:46 -04:00
mYmNeo
0bfc9c8de0
when container had no layer data, cleanupContainer crashed
...
Signed-off-by: mYmNeo <thomassong@tencent.com >
2016-04-06 12:40:20 -04:00
mYmNeo
ce87de21a7
fix TestCreateShrinkRootfs and TestCreateShrinkRootfs
...
Signed-off-by: mYmNeo <thomassong@tencent.com >
2016-04-06 12:40:20 -04:00
mYmNeo
90f512427f
fix test requirement about devicemapper and not overlay
...
Signed-off-by: mYmNeo <thomassong@tencent.com >
2016-04-06 12:40:19 -04:00
moxiegirl
ba9b348bda
Merge pull request #2046 from allencloud/fix-typos-in-docs
...
fix typos in docs
2016-04-06 09:17:02 -07:00
Tibor Vass
c7cf245053
Merge pull request #21751 from tonistiigi/runc-maskedpaths
...
Define readonly/mask paths in spec
2016-04-06 12:16:28 -04:00
Shishir Mahajan
606cf5310d
Ignore os.IsNotExist errors when calling ToDiskLocking
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2016-04-06 11:17:56 -04:00
Daniel Nephin
b33d7b3dd8
Prevent unnecessary inspection of containers when created from an inspect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-04-06 11:14:42 -04:00
John Howard
f3da0c9055
Merge pull request #21669 from msabansal/expose
...
Enabling expose support for Windows TP5
2016-04-06 07:52:07 -07:00
Brian Goff
e24673def2
Merge pull request #21795 from mountkin/refactor-init
...
refactor the init function in docker_utils.go
2016-04-06 10:39:55 -04:00
Brian Goff
891023617a
Merge pull request #21779 from Microsoft/jjh/dockerfile
...
Windows: Dockerfile for TP5
2016-04-06 10:23:53 -04:00
Brian Goff
c760ea3d93
Merge pull request #21785 from Microsoft/jjh/nodeletenat
...
Windows: integration-cli don't delete nat
2016-04-06 10:20:58 -04:00
Lei Jitang
9a7f2e7268
Correct the description of --group-add in run.md
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-04-06 21:52:10 +08:00
Stefan Majewsky
67321cb622
detect outdated container listings during Stat() and getAllSegments()
...
Signed-off-by: Stefan Majewsky <stefan.majewsky@sap.com >
2016-04-06 15:21:27 +02:00
Shijiang Wei
50d5d55f56
refactor the init function in docker_utils.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2016-04-06 20:16:00 +08:00
Arien Holthuizen
dbb6e28da2
Only check validity of S3 region if not using custom endpoint
...
Signed-off-by: Arien Holthuizen <aholthuizen@schubergphilis.com >
2016-04-06 13:38:09 +02:00
Lei Jitang
5bd1786387
Don't throw error on clenaup ipc mounts if it does not exists
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-04-06 07:34:31 -04:00
mikelinjie
66b8714da4
make the cache miss clear
...
Signed-off-by: mikelinjie <294893458@qq.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-04-06 00:48:21 -07:00
Lei Jitang
bb9b17314d
Merge pull request #21789 from npcode/docs-plugins-authorization-null
...
Use 'null' instead of 'nil' for json
2016-04-06 15:29:40 +08:00