1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Tianon Gravi
65623e22aa Merge pull request #10716 from ahmetalpbalkan/win-cli/fix-emptyfs-path
Change emptyfs path in integration-cli tests
2015-02-12 15:29:48 -08:00
Ahmet Alp Balkan
ac6cb41d52 docker_api_attach_test: fix WS test to use DOCKER_TEST_HOST if specified
TestGetContainersAttachWebsocket is currently broken on Windows CI tests
b/c it has hardcoded unix://var/run/docker.sock.  This change makes use
of @icecrime's code in docker_utils and generalizes it with sockConn()
to provide a net.Conn by making use of DOCKER_TEST_HOST. Also fixes
the test.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-12 15:11:19 -08:00
Ahmet Alp Balkan
e1be475c5b Change emptyfs path in integration-cli tests
This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-12 15:02:18 -08:00
Stephen J Day
d2d46fca41 Move notifications package to distribution
Since the notifications package is now decoupled from storage, we are moving it
to the root package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-12 14:40:35 -08:00
Stephen Day
89f73a37e9 Merge pull request #169 from stevvooe/pem-out-gitignore
Add pem and out files to gitignore
2015-02-12 14:27:30 -08:00
Stephen J Day
286a644948 Remove Name from Layer and LayerUpload interface
A Layer or LayerUpload should not be coupled with the containing repository.
Remove the Name method and correctly reference from the repository where
appropriate.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-12 14:27:05 -08:00
Stephen J Day
27b03f2136 Move layer interface definitions to distribution package
After consideration, it has been decided that the interfaces defined in the
storage package provide a good base for interacting with various registry
instances. Whether interacting with a remote API or a local, on-disk registry,
these types have proved flexible. By moving them here, they can become the
central components of interacting with distribution components.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-12 14:26:46 -08:00
Doug Davis
802802b781 Merge pull request #10727 from ahmetalpbalkan/win-cli/integration-cli-compile-fix
Create builder/command, cut libcontainer dependency on integration-cli
2015-02-12 17:10:16 -05:00
Peter Salvatore
74b050bd0c Clean up explanation of doc branches.
Signed-off-by: Peter Salvatore <peter@psftw.com>
2015-02-12 17:02:56 -05:00
Arnaud Porterie
7a7c00ca08 Update docs for HTTP_PROXY
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-12 11:40:56 -08:00
Arnaud Porterie
d8f60a6cf7 Merge pull request #10739 from cpuguy83/fix_do_not_proxy_unix_sock
Do not use HTTP_PROXY for unix sock
2015-02-12 11:33:46 -08:00
Michael Crosby
3eb1939b69 Merge pull request #10694 from dmcgowan/remove-push-by-id
Remove push by ID
2015-02-12 11:25:38 -08:00
Jeffrey Morgan
3f4c26429b Merge pull request #176 from kitematic/setup-cancel
Change re-run to retry in setup
2015-02-12 11:00:28 -08:00
Jeffrey Morgan
b32f0b20c5 Change re-run to retry setup 2015-02-12 11:00:01 -08:00
Jeffrey Morgan
f80cda4e0d Merge pull request #175 from kitematic/setup-cancel
Adding setup retry when user cancels virtualbox install
2015-02-12 09:35:16 -08:00
Jeffrey Morgan
98c6e0fda5 Adding setup retry when user cancels virtualbox install 2015-02-12 09:25:00 -08:00
Ben Firshman
0a8f9abfae Remove @nathanleclaire as a maintainer
Thanks for your help <3

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-12 16:39:59 +00:00
Brian Goff
f6e697d2ac Do not use HTTP_PROXY for unix sock
Makes sure the CLI does not use HTTP_PROXY when connecting to unix
socket.
Also adds some tests to make sure this functionality works as expected.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-12 11:38:52 -05:00
Evan Hazlett
d1b425b210 Merge pull request #528 from SvenDowideit/return-error-even-when-vboxmanage-fails-to
Detect vboxmanage error conditions and pass those on as errors
2015-02-12 09:18:47 -05:00
Ben Firshman
3146fe5e4b Tidy up contributing guidelines
- Add intro saying we roughly follow the Docker project's guidelines
- Link to Docker's signing off docs
- Fix formatting at bottom

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-12 13:40:02 +00:00
Ahmet Alp Balkan
72a070c5da builder/parser: Make use of builder/command
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-11 23:54:41 -08:00
Victor Vieux
12e1b047e7 Merge pull request #392 from aluzzardi/doc-fix-port-binding
README: Fix port binding in example.
2015-02-11 23:02:41 -08:00
Ahmet Alp Balkan
ccde3a1f73 Create builder/command, cut libcontainer dependency on integration-cli
d1e9d07c introduces a dependency to libcontainer and other daemon
related packages through builder package. The only thing test needs
is set of the Dockerfile commands. Extracting them to a separate
package.

This was causing CI tests to not to compile on non-Linux platforms.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-11 21:44:31 -08:00
Sven Dowideit
d79e597f30 Tweak the text a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-12 12:39:41 +10:00
Sven Dowideit
49d1ab0eb2 update the test code to enable testing the extra info
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-12 12:39:41 +10:00
Greg Fausak
df8d807102 added -extfile to server certificate documentation for support of
subjectAltName=IP:x.x.x.x
this allows for connecting to the docker server from docker client
using the dns name OR using the IP address (lots of docker stuff
prefers IP addresses)

Signed-off-by: Greg Fausak <greg@tacodata.com>
2015-02-12 12:39:41 +10:00
Lei Jitang
f3713010dd Add tests for create /etc volume
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-12 10:39:07 +08:00
Fred Lifton
4a33686787 Revises Compose cli reference 2015-02-11 18:22:36 -08:00
Andrea Luzzardi
9f0d616273 README: Fix port binding in example.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-02-11 17:23:57 -08:00
Lei Jitang
fa228d8cbc Fix create volume /etc cover /etc/{hosts,resolv.conf,hostname}
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-12 08:46:53 +08:00
Stephen J Day
264f2ddbe2 Add pem and out files to gitignore
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-11 15:45:03 -08:00
Jeffrey Morgan
54e105e3fd Merge pull request #174 from kitematic/jmorgan-settings-fix
Fixing settings, testing SetupStore
2015-02-11 15:43:30 -08:00
Jeffrey Morgan
da2da138b6 Merge branch 'master' into jmorgan-settings-fix 2015-02-11 15:43:04 -08:00
Jeffrey Morgan
529f22eded Merge branch 'master' of github.com:kitematic/kitematic 2015-02-11 15:42:52 -08:00
Jeffrey Morgan
8f481bdc0e Update README.md 2015-02-11 15:39:33 -08:00
Jeffrey Morgan
847b4c7cba Fixing VirtualBox case 2015-02-11 15:36:55 -08:00
Jeffrey Morgan
343332e4c6 Adding it back 2015-02-11 15:24:45 -08:00
Jeffrey Morgan
e6ea5024b7 Temporary removal of VirtualBox 2015-02-11 15:24:29 -08:00
Jeffrey Morgan
a8a490ea70 Reverting to 1.4.1 for now 2015-02-11 15:10:12 -08:00
Jeffrey Morgan
621b0503ab Adding Setup tests and settings fix 2015-02-11 15:09:17 -08:00
Stephen Day
c23ad2715f Merge pull request #168 from ahmetalpbalkan/azure-readme
registry/storage/driver/azure: add README
2015-02-11 15:02:15 -08:00
Sven Dowideit
de62c65a71 Detect vboxmanage error conditions and pass those on as errors
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-02-12 08:46:18 +10:00
Ahmet Alp Balkan
76f1abfa07 storagedriver/azure: Add README
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-11 14:40:51 -08:00
Aanand Prasad
64239f1408 Merge pull request #950 from aanand/update-pep8
Update pep8, fix errors and freeze requirements-dev.txt
2015-02-11 21:33:14 +00:00
Olivier Gambier
2000759d51 Merge pull request #167 from stevvooe/registry-handler-package
registry: reorganize package layout
2015-02-11 13:27:39 -08:00
Stephen J Day
f74b9852fe Run goimports/gofmt on previous changes
After all of the perl refactoring, some import orderings were left asunder.
This commit corrects that.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-11 12:43:04 -08:00
Stephen J Day
65b0d73cb7 Move storagedriver package to registry/storage/driver
This change is slightly more complex than previous package maves in that the
package name changed. To address this, we simply always reference the package
driver as storagedriver to avoid compatbility issues with existing code. While
unfortunate, this can be cleaned up over time.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-11 12:43:04 -08:00
Stephen J Day
3468fbd4a8 Move storage package under registry package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-11 12:43:04 -08:00
Stephen J Day
2832ec7f5c Move client package under registry package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-11 12:42:56 -08:00
Andrea Luzzardi
0bc7230120 Merge pull request #391 from JeffChien/update_consul_api
Update consul api
2015-02-11 11:22:21 -08:00