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
Sebastiaan van Stijn
e41de3e631
Add examples for ENV vars in API
...
As discussed in https://github.com/docker/docker/issues/16623 ,
the API calls for setting ENV-vars lacked an actual example.
This PR adds some examples to the API calls.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-02 17:44:31 +01: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
Alexander Morozov
c70d1bde63
Update linting tools
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:32:49 -08:00
Alexander Morozov
7aa28b6bdd
Fix go vet warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:28:34 -08:00
Alexander Morozov
270e8cf64d
Fix golint warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:02:25 -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
Shijiang Wei
a82f9ac819
increase the maxJSONDecodeRetry in json log reader
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-02 17:51:22 +08: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
John Howard
864e892e2a
Windows: Fix dockerfile\parser unit test
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-01 20:08:37 -08: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
John Howard
8764967381
Windows: Fix daemon\graphdriver\graphtest
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 21:14:18 -07: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
John Howard
910e4ba7ed
Windows: Factor out user in execdriver\driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 19:19:24 -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
John Howard
be2f53ece8
Windows: Fix native exec template
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 11:39:19 -07:00
John Howard
96b45e9216
Windows: Fix docker device tool
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 11:32:37 -07: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
Brian Goff
f87082f08e
Merge pull request #17545 from LK4D4/writehs_encode
...
Use json.Encoder for container.writeHostConfig
2015-10-30 21:11:15 -04:00
Brian Goff
cccb6bce7d
Merge pull request #17524 from mountkin/fix-teardown
...
dont try to remove builtin networks in teardown
2015-10-30 20:59:57 -04:00