Commit Graph
36884 Commits
Author SHA1 Message Date
Pascal Borreli 43d8f667fd Fixed typos
Upstream-commit: 147b04ce2b
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens d7f43325f2 Fixed some typo's and formatting issues in remote api documentation.
Upstream-commit: 22ab3ddc8a
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher 67f5bb8bb9 Some more improvements on the docs readme. Removed references to website.
Upstream-commit: 2216afb617
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens 34f087441b Updated docs README with instructions to preview the generated manfile, and where to get the one generated by sphinx.
Upstream-commit: 9c5f4391e1
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens cdc3377009 Enabled the docs to generate manpages.
* changed conf.py to reference toctree.rst instead of index
* Added note to README to upgrade your sphinx to the latest version to prevent a bug with .. note:: blocks.
Upstream-commit: 77926c6033
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica 99a1852177 Make style consistent
Upstream-commit: 74428120af
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica 95534b5821 Add Mac OS X instructions for doc tools
Upstream-commit: 3c035fa508
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica d08724ab40 Add make server command to preview docs
Upstream-commit: 99dfa4e7e8
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens aec84e0e64 Updated index to reflect new (short) 'engine' message (merged with solomon's new text), also moved around the layout a bit and fixed some small text errors.
Upstream-commit: 6d79cab514
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens c6d0d33e87 Added code and color for 'note' and updated the hello world note.
Upstream-commit: f4399fe403
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens 9d6a9f36e8 Improved README
Upstream-commit: 8a39a45f05
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens b07dff2c8e Merge of docker-website into the docker documentation.
Upstream-commit: 244477e27f
Component: cli
2017-06-02 00:06:18 +00:00
dhrp 73808e2330 create README.md at this place for preview.
Upstream-commit: f35a9d8098
Component: cli
2017-06-02 00:06:18 +00:00
Daniel Nephin 91d25d6fe0 Only set default aliases when the network is user defined.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit d5b505ee8c)
2017-05-31 19:07:11 -07:00
Daniel Nephin 6c534bb5a0 Add tests for verifyExternalNetwork
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 341703d21e)
2017-05-31 19:07:08 -07:00
Madhu Venugopal 1c46b8f4d3 With the introduction of node-local network support, docker services can
be attached to special networks such as host and bridge. This fix brings
in the required changes to make sure the stack file accepts these
networks as well.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 123f0bfd98)
2017-05-31 19:07:05 -07:00
Nishant Totla f156aa746e Adding unit tests for pin by digest (client)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 75c7536d2e2e328b644bf69153de879d1d197988)
2017-05-31 11:40:48 -07:00
Nishant Totla 5c5cc1fccd Ensure service images get default tag and print familiar strings
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 5efcec77170dd6c4087d4f1fb3695c32d94edfb4)
2017-05-31 11:40:48 -07:00
John Stephens cd6b682d4f Include stack service configs in service specs
Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit b7cac96f69)
2017-05-31 11:37:32 -07:00
John Stephens 19e7c1efe9 Remove stack configs on stack removal
Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit f05cd11ee2)
2017-05-31 11:35:59 -07:00
Marcus Martins 32807d0a87 Handle a Docker daemon without registry info
The current implementation of the ElectAuthServer doesn't handle well when the
default Registry server is not included in the response from the daemon Info
endpoint.

That leads to the storage and usage of the credentials for the default registry
(`https://index.docker.io/v1/`) under an empty string on the client config file.

Sample config file after a login via a Docker Daemon without Registry
information:
```json
{
	"auths": {
		"": {
			"auth": "***"
		}
	}
}
```

That can lead to duplication of the password for the default registry and
authentication failures against the default registry if a pull/push is performed
without first authenticating via the misbehaving daemon.

Also, changes the output of the warning message from stdout to sdterr as
per dnephin suggestion.

Signed-off-by: Marcus Martins <marcus@docker.com>
(cherry picked from commit 862649707e)
2017-05-31 11:34:01 -07:00
Brian Goff e7776047c2 Bump go to go1.8.3
Note that go1.8.2 contains a security fix (CVE-2017-8932).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 0c7c900e9e66335a6bd486be008af43ae83a5a37)
2017-05-31 11:29:38 -07:00
Ying Li 30e966bc97 Do not clear swarm directory at the begining of swarm init and swarm join now.
However, do clear the directory if init or join fails, because we don't
want to leave it in a half-finished state.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit bf3e9293a66c77a2fddf4e691222898846b4af9f)
2017-05-31 11:25:56 -07:00
Evan Hazlett bb1fe809d2 remove RuntimeData from cluster and types
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
(cherry picked from commit 8eeba751983d6499a07fcd21c26f381eb1d17d19)
2017-05-31 11:08:24 -07:00
Sandeep Bansal e724dcd16b Adding support for DNS search on RS1
Signed-off-by: Sandeep Bansal <sabansal@microsoft.com>
(cherry picked from commit b8e8dcd6e031d005a2d46d95f84da35b436cd870)
2017-05-31 10:55:38 -07:00
Neil Horman 96c9cd5c39 Ensure that a device mapper task is referenced until task is complete
DeviceMapper tasks in go use SetFinalizer to clean up C construct
counterparts in the C LVM library.  While thats well and good, it relies
heavily on the exact interpretation of when the golang garbage collector
determines that an object is unreachable is subject to reclaimation.
While common sense would assert that for stack variables (which these DM
tasks always are), are unreachable when the stack frame in which they
are declared returns, thats not the case.  According to this:

https://golang.org/pkg/runtime/#SetFinalizer

The garbage collector decides that, if a function calls into a
systemcall (which task.run() always will in LVM), and there are no
subsequent references to the task variable within that stack frame, then
it can be reclaimed.  Those conditions are met in several devmapper.go
routines, and if the garbage collector runs in the middle of a
deviceMapper operation, then the task can be destroyed while the
operation is in progress, leading to crashes, failed operations and
other unpredictable behavior.

The fix is to use the KeepAlive interface:

https://golang.org/pkg/runtime/#KeepAlive

The KeepAlive method is effectively an empy reference that fools the
garbage collector into thinking that a variable is still reachable.  By
adding a call to KeepAlive in the task.run() method, we can ensure that
the garbage collector won't reclaim a task object until its execution
within the deviceMapper C library is complete.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
(cherry picked from commit d764d8b16624e4924b3949273089f851efa0f717)
2017-05-31 10:42:53 -07:00
Darren Stahl 4360062d33 Update go-winio to v0.4.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 3f13107223a9753d709c196c46f1c846041fc0c3)
2017-05-31 10:39:35 -07:00
Brian Goff 5acb14a901 Don't unmount entire plugin manager tree on remove
This was mistakenly unmounting everything under `plugins/*` instead of
just `plugins/<id>/*` anytime a plugin is removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db5f31732a9868c1e9e4f9a49be70b794ff82d4f)
2017-05-31 10:37:33 -07:00
Alfred Landrum 43484d9284 prevent image prune panic
Signed-off-by: Alfred Landrum <alfred.landrum@docker.com>
(cherry picked from commit 32da2a4234c5c68ff466dc1afc91ba98dbbe199a)
2017-05-31 09:58:11 -07:00
Andrew Hsu 7f8486a39a pass in git commit override when building deb
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3c70b56937c415c6bf3516aeaa5231c6d7d3145d)
v17.06.0-ce-rc1
2017-05-25 06:00:03 +00:00
Andrew Hsu 5f615dd295 override ver and git commit when building all deb pkgs
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 4397990e00863254d78c44fbe904a70272b5b340)
2017-05-25 05:59:47 +00:00
Andrew Hsu f3810787c8 pass in optional GITCOMMIT override
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 446af3a9b7)
2017-05-24 23:03:09 +00:00
Andrew Hsu 2bcfe6ffc2 bump VERSION files to 17.06.0-ce-rc1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-24 02:24:43 +00:00
Andrew Hsu 0b4548c769 allow version number to be set in builds
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3dfe334a7a)
2017-05-24 02:21:53 +00:00
Andrew Hsu 3faf0eaaca Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-05-20 06:07:04 +00:00
Andrew Hsu ca31069c30 added clean target to the makefile
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 06:06:29 +00:00
Andrew Hsu 2c17301752 pass the top-level version to packaging targets
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 06:03:35 +00:00
Andrew Hsu 3e531d5fd4 change default target to call for static binaries
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 06:02:06 +00:00
Andrew Hsu a36b59a609 fix static package generation
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3513248c56fc917a0b37ff140ca7981d7af933ef
Component: packaging
2017-05-20 06:00:56 +00:00
Andrew Hsu b3f06aaffe Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-05-20 05:12:23 +00:00
Andrew Hsu 61ed131a71 initial commit
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f64fc552cdfc4b4f2efb384054970fb0bfc1bd25
Component: packaging
2017-05-20 05:11:06 +00:00
Tibor Vass 969598bdd6 Initial commit
Upstream-commit: 3b31275fd8206e35f73e37d91ccaea19446eb79c
Component: packaging
2017-05-19 20:08:25 -07:00
Andrew Hsu b89892dc70 added more words to readme
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 00:22:54 +00:00
Andrew Hsu 3335862e61 Merge component 'engine' from git@github.com:moby/moby master 2017-05-19 23:48:32 +00:00
Andrew Hsu ee4c982801 Merge component 'cli' from git@github.com:docker/cli master 2017-05-19 23:24:51 +00:00
Andrew Hsu 37d72b0858 initial commit
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-19 23:20:37 +00:00
Andrew Hsu 56595bb8e6 initial readme
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-19 16:10:50 -07:00
Sebastiaan van Stijn ddd4203548 Merge pull request #33261 from aaronlehmann/empty-platform
api: Only return a Platform when relevant information is available
Upstream-commit: f888a25ff5bc9bb7c95400ec19b9a5fa0d738bab
Component: engine
2017-05-19 20:05:07 +02:00
Sebastiaan van Stijn 756d246384 Merge pull request #33299 from thaJeztah/explain-relation-between-paused-and-stopped
Improve description of Running and Paused booleans
Upstream-commit: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff
Component: engine
2017-05-19 16:29:05 +02:00
Sebastiaan van Stijn 1dc2936c51 Merge pull request #33293 from fd/patch-1
Remove deadlock in ContainerWait
Upstream-commit: d98d4faef86c4ba4470c7f28c2ce92c10de4a565
Component: engine
2017-05-19 16:17:54 +02:00