Commit Graph

19507 Commits

Author SHA1 Message Date
Doug Davis
c90125dc8a Merge pull request #17637 from aaronlehmann/network-test-name-typo
Fix typo in name of integration test TestInspectApiMultipeNetworks
2015-11-02 20:42:36 -05:00
Brian Goff
c6c7d5870c Merge pull request #17635 from MHBauer/volume-backend
create generic backend to cut dependency on daemon
2015-11-02 20:31:46 -05:00
Aaron Lehmann
701e5dfe8a Fix typo in name of integration test TestInspectApiMultipeNetworks
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 17:30:16 -08:00
Morgan Bauer
836df9c446 create generic backend to cut dependency on daemon
- create a volume-specific interface that for the methods of daemon
   that are used
 - remove dependency on daemon package by volume package of server
 - like 5087977fc1

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-02 16:29:16 -08:00
David Calavera
79d47c5b96 Merge pull request #17628 from LK4D4/umount_log_err
Log error from unmountVolumes on cleanup
2015-11-02 15:38:32 -08:00
David Calavera
65cbf37bf7 Merge pull request #17626 from mavenugo/ith
IT for ungraceful daemon restart with multiple host-mode containers
2015-11-02 15:38:14 -08:00
Doug Davis
6d5e47a690 Merge pull request #17517 from MHBauer/network-impl
create generic backend to cut dependency on daemon
2015-11-02 17:54:28 -05:00
Derek McGowan
6964f42350 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
2015-11-02 14:37:04 -08:00
David Calavera
642a1f67b6 Merge pull request #17573 from Microsoft/10662-parsersos
Windows: Fix unit tests parsers\os
2015-11-02 14:31:09 -08:00
Alexander Morozov
944ea3134d Merge pull request #17554 from calavera/warm_ipc_unmounts
Turn IPC unmount errors into warnings.
2015-11-02 14:25:39 -08:00
Alexander Morozov
a20fea1823 Log error from unmountVolumes on cleanup
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 14:11:42 -08:00
Madhu Venugopal
b323e3df8b IT for ungraceful daemon restart with multiple host-mode containers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-02 14:00:11 -08:00
Aaron Lehmann
257c59251b Vendor updated version of docker/distribution
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 12:40:18 -08:00
Morgan Bauer
5087977fc1 create generic backend to cut dependency on daemon
- create a network-specific interface that for the methods of daemon
   that are used
 - remove dependency on daemon package

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-02 12:30:10 -08:00
David Calavera
beeec6d103 Merge pull request #17558 from aboch/nw
Fix bug in initializeNetwork()
2015-11-02 12:15:41 -08:00
David Calavera
920ab75bd5 Merge pull request #17598 from zelahi/16756-dockercli-createtest
Added c.Assert statements to docker_api_create_test.go
2015-11-02 11:43:20 -08:00
David Calavera
b95048758a Merge pull request #17619 from jfrazelle/canonical-update
rebased canonical/json off go 1.5.1
2015-11-02 11:42:26 -08:00
David Calavera
f962c0715f Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
Bring TESTDIRS back for unit-tests
2015-11-02 11:41:19 -08:00
John Howard
a40c828040 Windows: Fix unit tests parsers\os
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-02 11:28:47 -08:00
Alessandro Boch
45e71a7984 Fix bug in initializeNetwork()
- On `docker run --net <network id> ...`
  the bug would cause the container to attempt
  to connect to the network two times
- Also made sure endpoint creation rollback will
  be executed on failures in `func (container *Container) connectToNetwork()`

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-02 11:20:15 -08:00
Tibor Vass
6c31a9a50d Merge pull request #17594 from mrjana/restart
Fix race with host networking causing `invalid argument` errors
2015-11-02 13:46:43 -05:00
Vincent Demeester
4a54ab387f Add TESTDIRS back
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-02 19:44:09 +01:00
Jessica Frazelle
0d881349e8 rebased canonical/json off go 1.5.1
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-02 10:23:02 -08:00
Alexander Morozov
6563b7d2e8 Merge pull request #17542 from estesp/restart-root-dir-cleanup
Fix integration-cli daemon restart with user namespaces enabled
2015-11-02 09:50:12 -08:00
Alexander Morozov
ca1e2d5782 Merge pull request #17605 from runcom/enhance-err-msg
graph: enhance err message on failed image restore
2015-11-02 08:49:43 -08:00
Jana Radhakrishnan
10e1b9f02e Vendoring libnetwork
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-11-02 08:33:52 -08:00
Doug Davis
ca0a9913c3 Merge pull request #17609 from LK4D4/fix_format
Fix error formatting
2015-11-02 10:34:29 -05:00
Alexander Morozov
b087846c0e Fix error formatting
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 06:51:48 -08:00
Vincent Demeester
38d3fc00d3 Merge pull request #17602 from HuKeping/update-history
Update logic of history
2015-11-02 13:55:32 +01:00
Antonio Murdaca
f5fc832b6e graph: enhance err message on failed image restore
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-02 10:10:23 +01:00
Zuhayr Elahi
6694326d5d Added c.Assert statements to docker_api_create_test.go
removed the if/else statements and added c.Assert statements for docker_api_create_test.go.

Removed check.commentf in c.Assert statements

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-11-01 19:54:19 -08:00
Sven Dowideit
c6fd886db3 Merge pull request #17601 from moxiegirl/moving-project
Moving project to docker/opensource
2015-11-02 12:44:41 +10:00
Mary Anthony
e400125b66 Moving project to docker/opensource
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 18:39:10 -08:00
Hu Keping
5a3236d9e8 Update logic of history
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-11-02 10:27:54 +08:00
moxiegirl
e2e2ea401a Merge pull request #17591 from moxiegirl/remove-old-api
Remove old api docs that are no-longer appearing on docs-docker.com
2015-11-01 12:30:58 -08:00
Alexander Morozov
1340d456ad Merge pull request #17572 from Microsoft/10662-parserskernel
Windows: Fix parsers kernel test
2015-11-01 10:37:22 -08:00
Mary Anthony
d2382f7b96 Remove old api docs that are no-longer appearing on docs-docker.com
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 08:22:10 -08:00
Sebastiaan van Stijn
e2a879bedd Merge pull request #17590 from moxiegirl/fix-122-link
Update to hide the 1.10 material
2015-11-01 17:06:44 +01:00
Mary Anthony
e4d86c2c38 Update to hide the 1.10 material
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 08:03:08 -08:00
Sebastiaan van Stijn
d4bf773d27 Merge pull request #17583 from moxiegirl/link-fixes
Fixing broken links
2015-11-01 16:44:15 +01:00
John Howard
670fd201de Windows: Fix parsers kernel test
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-01 07:05:16 -08:00
Antonio Murdaca
29c9717cac Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test
refactor docker_cli_netmode_test .go with Assert statement
2015-11-01 11:07:54 +01:00
Mary Anthony
5ce093e945 Fixing broken links
Fixing the weight

Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-31 19:45:56 -07:00
Phil Estes
0c57b9f5b3 Fix integration-cli daemon restart with user namespaces enabled
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-31 14:39:33 -04:00
Alexander Morozov
4468e1e74e Merge pull request #17567 from Microsoft/10662-lxcunittest
Windows: Fix go test in execdriver\lxc
2015-10-31 09:40:19 -07:00
Alexander Morozov
8d584da96e Merge pull request #17568 from Microsoft/10662-journald
Windows: Fix journald compile error
2015-10-31 09:35:39 -07:00
John Howard
5452954d89 Windows: Fix journald compile error
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:31:25 -07:00
John Howard
30ab497e17 Windows: Fix go test in execdriver\lxc
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:25:36 -07:00
Arnaud Porterie
5719d01066 Merge pull request #16579 from coolljt0725/fix_attach_paused_container
Add show error when attach to a paused container
2015-10-31 07:43:22 -07:00
Alexander Morozov
ed6e3cf704 Merge pull request #17537 from mountkin/fix-logger-race
fix a race in json logger reader
2015-10-30 23:00:17 -07:00