Brian Goff
b900aaac46
Merge pull request #14701 from charleswhchan/patch-6
...
Add missing space
2015-07-17 10:42:48 -04:00
Jessica Frazelle
541920c770
Re-add back root Dockerfile for cross comiling and with GOPATH setup correctly.
...
Fix notary-server Dockerfile so the COPY is after the run otherwise the cache
will bust on the COPY and you wind up having to run the RUN apt-get every
single time you build the Dockerfile.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-17 07:38:17 -07:00
Aanand Prasad
35092f1d5e
Fix regression in docs for 'up'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-17 15:29:02 +01:00
Aanand Prasad
445fe89fce
Tweak wording of scale warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-17 15:24:17 +01:00
Aanand Prasad
9ffe69a572
Refactor can_be_scaled for clarity
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-17 15:24:17 +01:00
Aanand Prasad
6ca781416e
Merge pull request #1715 from moxiegirl/propos-alternates
...
Updating Compose documentation
2015-07-17 15:23:53 +01:00
Mary Anthony
36f4d413fd
Updating Compose documentation
...
- Split out commands into individual pages for maintainability
- Add full usage in commands pages for usability
- Updated description of the run command
- adding in Aanand's comment
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-17 07:05:45 -07:00
Vincent Batts
a40e337882
graph: clarify the need for named error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-17 10:01:52 -04:00
Doug Davis
c5c98c31a1
Fix InspectExecID test
...
The check for the end of the loop was off by one which is why we saw
errors on the following inpsect() call instead of a timeout
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-17 06:46:37 -07:00
Mazz Mosley
c8643828d2
Merge pull request #1702 from aanand/smart-recreate-by-default
...
Smart recreate by default
2015-07-17 14:39:40 +01:00
cclauss
5827b06558
Correct the local directory path in Managing Volumes
...
Added Documents/ to path. This should close issue https://github.com/kitematic/kitematic/issues/830
Signed-off-by: Christian Clauss cclauss@bluewin.ch
2015-07-17 15:29:30 +02:00
Aanand Prasad
ced94a3504
Make smart recreate the default
...
Add --force-recreate flag to enable the old default behaviour of
recreating everything.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-17 11:28:02 +01:00
Aanand Prasad
b2cb5a48d2
Merge pull request #1714 from aanand/scale-timeout
...
Make scale timeout configurable, default to 10
2015-07-17 10:13:30 +01:00
yuzou
0fc7babf76
Close reader after the test is finished.
...
Signed-off-by: yuzou <zouyu7@huawei.com >
2015-07-17 14:55:31 +08:00
Charles Chan
ceca4109fa
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-16 22:49:46 -07:00
Alexander Morozov
ac3f7c71b8
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
2015-07-16 21:42:42 -07:00
Doug Davis
97c5f64001
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-16 20:27:14 -07:00
Peggy Li
2628b5510a
Update Github links to point to docker/swarm
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-07-16 19:03:26 -07:00
Aaron Lehmann
f5c1d8dbc9
Add ED25519 support to cryptoservice and x509utils
...
Add unit tests for cryptoservice that do sign and verify for all three
supported algorithms.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-16 18:44:44 -07:00
root
9ca913d0f1
Go Scheduler issue with sync.Mutex using gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-17 01:33:58 +00:00
David Calavera
15cb7dfc9e
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
2015-07-16 18:02:51 -07:00
Alexander Morozov
c86189d554
Update libcontainer
...
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.
Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-16 16:02:26 -07:00
Alexander Morozov
8801906ced
Merge pull request #14620 from hqhq/hq_cgroup_ro_optional
...
Remove cgroup read-only flag when privileged
2015-07-16 16:00:02 -07:00
John Howard
39ad38ccf9
Windows: hostconfig on start
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-16 15:33:13 -07:00
David Calavera
5d3043649a
Merge pull request #14690 from LK4D4/update_libnetwork
...
Update libnetwork
2015-07-16 15:13:24 -07:00
Stephen Day
fed58bd2d3
Merge pull request #705 from stevvooe/export-servejson-errors
...
Export ServeJSON for serving error codes
2015-07-16 14:35:27 -07:00
David Calavera
6c0795747b
Separate plugin sockets and specs.
...
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-16 14:20:07 -07:00
Alexander Morozov
b84ceb3d0a
Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
...
This update includes removal of libcontainer dependency.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-16 13:58:38 -07:00
John Howard
a207ce6ae4
Windows: Hook up user supplied MAC
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-16 13:20:14 -07:00
Ryan Grothouse
d553a2c757
added support for setting environment variables in docker engines
...
Signed-off-by: Ryan Grothouse <rgrothouse@gmail.com >
2015-07-16 16:12:06 -04:00
Stephen Day
c4208c4cce
Merge pull request #706 from BrianBland/authLoggingWarnLevel
...
Reduces log level of auth error lines from error->warn
2015-07-16 12:50:55 -07:00
Stephen Day
212525f951
Merge pull request #14664 from calavera/fix_load_tag_with_digest
...
Check if a tag name to load is a valid digest.
2015-07-16 12:46:05 -07:00
Brian Bland
c25f4af00f
Reduces log level of auth error lines from error->warn
...
An error level log is already produced within app.authorized() if an
actual unexpected error occurs during authorization, so this warning
level log remains for auditability purposes, but should not be
considered an error condition.
Addresses #704
Signed-off-by: Brian Bland <brian.bland@docker.com >
2015-07-16 12:43:33 -07:00
Stephen J Day
86ffe515df
Export ServeJSON for serving error codes
...
This changeset provides a common http handler for serving errcodes. This should
unify http responses across webservices in the face of errors.
Several type assertions have been added, as well, to ensure the error interface
is implemented.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-07-16 12:14:14 -07:00
John Howard
83ad0536c1
Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-07-16 12:07:20 -07:00
Alexandre Beslic
729001c9b4
Merge pull request #1066 from vieux/n_engine
...
rename n to e
2015-07-16 11:57:27 -07:00
Victor Vieux
39309f7a62
rename n to e
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-16 11:55:33 -07:00
David Calavera
5365e6b463
Merge pull request #13375 from tiborvass/distribution-refactor
...
Vendor distribution client v2
2015-07-16 11:54:08 -07:00
Victor Vieux
48115bce68
Merge pull request #1065 from vieux/random_port
...
support docker run -p <port> in mesos (random)
2015-07-16 11:45:17 -07:00
Richard Scothern
52acadc625
Merge pull request #70 from RichardScothern/enable-remote-signer
...
Enable remote signing service
2015-07-16 11:34:17 -07:00
Victor Vieux
542620d60d
support docker run -p <port> in mesos (random)
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-16 11:24:45 -07:00
Richard Scothern
e5d6180276
Enable remote signing service
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-07-16 11:16:40 -07:00
Victor Vieux
1d8d00a55e
add changelog
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-16 11:06:39 -07:00
David Calavera
1ec25653d8
Check if a tag name to load is a valid digest.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-16 10:53:56 -07:00
Derek McGowan
19515a7ad8
Update graph to use vendored distribution client for the v2 codepath
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 13:13:47 -04:00
Tibor Vass
276c640be4
remove pkg/transport and use the one from distribution
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 13:13:46 -04:00
Tibor Vass
745820fec0
Vendor docker distribution registry client and dependencies
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 13:13:46 -04:00
Tibor Vass
48a01a317c
Merge pull request #14679 from tiborvass/fix-docker-py-search-test
...
Fix issue where Search API endpoint would panic due to empty AuthConfig
2015-07-16 13:12:31 -04:00
David Lawrence
40eaf8f2f1
Merge pull request #69 from RichardScothern/deploy
...
Fix the staging deployment.
2015-07-16 10:00:33 -07:00
Richard Scothern
df18a541e2
Fix the staging deployment.
...
Add a service name and ephemeral ports to notary server.
Remove certs as TLS is terminated in the ELB.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-07-16 09:50:52 -07:00