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
Victor Vieux
63997816a5 Merge pull request #1945 from jimmyxian/add-support-ps-node-filter
Add support ps node filter
2016-03-11 13:09:49 -08:00
Sebastiaan van Stijn
81b7a1b756 Merge pull request #21077 from moxiegirl/carry-20160
Document Volume Removal in User Guide
2016-03-11 22:08:25 +01:00
Aditi Rajagopal
ae66d536a5 Document Volume Removal in User Guide
Resolves: #20113
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>

Carry #20160
Tighten language
Updating with comments
Removing articles which is empty
Adding Brian's comments
Putting back what I took out

Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-11 12:29:47 -08:00
David Gageot
5648ebe83b Merge pull request #3097 from tpires/1858-generic-engine-port
FIX #1858 Add engine port
2016-03-11 21:21:35 +01:00
Christopher Jones
2a02914892 Fix error-checking when looking at empty log
Fixes a bug when the log output is empty.

The length of a slice containing an empty string is 1, not 0, so
the test fails to catch when the log is empty. Instead, take a look at
out, which is just a string.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-03-11 15:09:00 -05:00
Phil Estes
e207645307 Fix gcc compile test with proper flag ordering
This test for libdevmapper was always silently failing because the
linker never got the `-ldevmapper` information. Putting the flag last
corrects the test.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-11 15:08:58 -05:00
Brian Goff
11d3f7092e use per-check timeouts
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:52 -05:00
Brian Goff
e6e0837cbb Use forked gocheck and vendor
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:50 -05:00
Riyaz Faizullabhoy
571df4ba86 Merge pull request #618 from HuKeping/tiny
Tiny refactor
2016-03-11 11:28:27 -08:00
Arnaud Porterie
949e53a0f1 Merge pull request #21127 from icecrime/add_john_maintainer
Add @jhowardmsft to maintainers
2016-03-11 11:14:37 -08:00
Arnaud Porterie
11d10b77ac Add @jhowardmsft to maintainers
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-11 10:47:14 -08:00
David Calavera
9842c7a741 Merge pull request #21129 from allencloud/fix_typos
fix typos
2016-03-11 10:16:40 -08:00
Tonis Tiigi
16e4c4e481 Fix docker run for 64 byte hex ID
Fixes #20972

Also makes sure there is no check to registry if
no image is found for the prefixed IDs.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-11 10:02:47 -08:00
David Calavera
12c67f42d8 Merge pull request #21100 from aaronlehmann/remove-windows-specific-registry
Remove Windows-specific default registry definitions
2016-03-11 09:31:55 -08:00
Justin Cormack
5abd881883 Allow restart_syscall in default seccomp profile
Fixes #20818

This syscall was blocked as there was some concern that it could be
used to bypass filtering of other syscall arguments. However none of the
potential syscalls where this could be an issue (poll, nanosleep,
clock_nanosleep, futex) are blocked in the default profile anyway.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-11 16:44:11 +00:00
Tibor Vass
1c0474ed63 Merge pull request #20476 from wenchma/19425-TestDaemonStartWithDaemonCommand
Optimize slow bottleneck tests of TestDaemonStartWithDaemonCommand
2016-03-11 10:54:48 -05:00
allencloud
bbeb859b64 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-11 23:22:16 +08:00
Daniel Dao
ae6ee5e4af upgrade go-gelf vendor
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-03-11 15:18:58 +00:00
Tiago Pires
63ea976b1d FIX #1858 Add engine port
Added flag `--generic-engine-port` to `generic` drive in order to specify other port than `2376` on
Docker engine.
Updated `generic` driver documentation.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
2016-03-11 13:13:30 +00:00
Justin Cormack
68bda672dc Update statically linked libseccomp to 2.3.0
Fixes #20550

This update to libseccomp supports the new versions of socket
system calls that can be called directly rather than via the
socketcall syscall in kernel versions 4.3 or later with new glibc.

Note this library version now supports s390x and ppc64le, so
seccomp can be potentially be enabled for these architectures now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-11 13:01:30 +00:00
HuKeping
2136ca54ba [MISC 4/4] distinguish nil and empty map
Since the function len(X) will return 0 no matter X is nil or
an empty map.

We should distinguish that.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 17:24:47 +08:00
HuKeping
9501cddc1d [MISC 3/4] Refactor: move test helper function to test package
The helper function "GetSupportedHashes" is only used in tests,
it's better to move it to the relevant test file.

Since it's for the test, remove the origin test code for it.

And it also a good idea to call "NewfileMeta" instead of implement
once again.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 17:24:43 +08:00
HuKeping
30c9cfc113 [MISC 2/4] Constant: use constant instead of some literal string
Replace the "sha256" by the constant defined in the notary-const file.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 16:44:14 +08:00
HuKeping
6cd6b4726c [MISC 1/4] Tiny refactor
Reduce function "snapshotExpired" in a simpler form and replace the
literal string by the constants defined in the data package.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 16:43:44 +08:00
HuKeping
7e1a9947de Tiny refactor
If we can use a simple name for the local variable.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 14:11:27 +08:00
Tianon Gravi
a667cd88c3 Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
Instead of being split between three files, let's let `hack/make/.detect-daemon-osarch` be our single source of truth for multiarch detection/vars.  Not only does it make it slightly easier to make sure we change everything properly when these bits have to change, but it also makes it so that all bits of `hack/make.sh` (especially `hack/make/.ensure-frozen-images`) work properly outside the context of the `Makefile` on all platforms.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-03-10 20:07:21 -08:00
Brian Goff
9ad946eded Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
Fix the vendoring script on MacOS X
2016-03-10 22:45:55 -05:00
Yongqiao Wang
134df4293c Support rescind offer in swarm.
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-03-11 11:13:56 +08:00
HuKeping
2f61b0a445 [PATCH 8/8] Add some test
For the added functions of this patch set.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:45:05 +08:00
HuKeping
4d9e2e5e16 [PATCH 7/8] Update the server side
Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:45:01 +08:00
HuKeping
bf97855897 [PATCH 6/8] Add sha512 check when downloading TUF roles
Since the timestamp role need not the hash checking during the downloading,
thi patch only includes:
- snapshot.json
- root.json
- target.json

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:44:56 +08:00
HuKeping
95ed108c12 [PATCH 5/8] Add sha512 check on CLI command
Include:
- verify

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:44:49 +08:00
HuKeping
206d02ab4d [PATCH 4/8] Add sha512 when updating
Actually there are two way to implement this.

One is check the present hash algorithm first and then only update
what we have.

The other is update/add both sha256 and sha512 no matter whether we
have the hash of sha512 or not.

Personally I prefer the latter, for it brings much less change of the
code and will also not affect the validate of the old clients.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:44:46 +08:00
HuKeping
6b96c7e56d [PATCH 3/8] Add sha512 when creating target, snapshot and timestamp
Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:44:42 +08:00
HuKeping
30790aaa68 [PATCH 2/8] Add some helper functions
Include:
- A helper function to verify checksums generate by different hash algorithms.
- A helper function to generate checksums of all the supported hash algorithms.
- A helper fucntion to do a sanity check for every checksum.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:44:39 +08:00
HuKeping
7344f4e3da [PATCH 1/8] Create constants for sha256 and sha512
Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-03-11 10:44:33 +08:00
Aaron Lehmann
87535ca2e9 Remove Windows-specific default registry definitions
Going forward, Docker won't use a different default registry on Windows.
This changes Windows to use the standard Docker Hub registry as the
default registry.

There is a plan in place to migrate existing images from the Windows
registry to Hub's normal registry, in advance of the 1.11 release. In
the mean time, images on the Windows registry can be accessed by
prefixing them with `registry-win-tp3.docker.io/`.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-10 18:33:14 -08:00
Xian Chaobo
e7065eabf7 add support ps node filter
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-11 10:31:33 +08:00
Qiang Huang
dc56a76bc9 Fix race condition with exec and resize
When I use `docker exec -ti test ls`, I got error:
```
ERRO[0035] Handler for POST /v1.23/exec/9677ecd7aa9de96f8e9e667519ff266ad26a5be80e80021a997fff6084ed6d75/resize returned error: bad file descriptor
```

It's because `POST /exec/<id>/start` and
`POST /exec/<id>/resize` are asynchronous, it is
possible that exec process finishes and ternimal
is closed before resize. Then `console.Fd()` will
get a large invalid number and we got the above
error.

Fix it by adding synchronization between exec and
resize.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-03-11 09:59:50 +08:00
Ken Cochrane
94445b2fea Put back the hack that was originally in place.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-10 20:27:44 -05:00
Brian Goff
edf3c0f112 Merge pull request #21102 from tiborvass/template-improve-contrast
Improve github templates
2016-03-10 20:18:30 -05:00
moxiegirl
2342879763 moving row to top 2016-03-10 17:01:25 -08:00
Ahmet Alp Balkan
ec33a7dfc3 Add RELEASE.md note about deprecation notice
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-10 17:00:54 -08:00
Brian Bland
5967d33342 Removes ceph rados driver in favor of Swift API gateway support
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-03-10 16:49:08 -08:00
Nathan LeClaire
ccc5fe6c7d Merge pull request #3176 from clnperez/build-w-alternate-workspace
Add example for building using existing workspace
2016-03-10 16:48:27 -08:00
Ahmet Alp Balkan
ce3cb54482 Update default image to Ubuntu 15.10
- Default image now is ubuntu server 15.10. This ensures consistency with
  other cloud drivers.
- Better error message when virtual machine already exists.
- Change default SSH user from `ubuntu` to `docker-user`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-10 16:36:21 -08:00
Nathan LeClaire
8368901af2 Bump to Docker version 1.10.3
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-10 15:48:57 -08:00
Sebastiaan van Stijn
1d094255d5 Merge pull request #21045 from calavera/registry_config_options
Move registry service options to the daemon configuration.
2016-03-11 00:48:55 +01:00
Tibor Vass
8d9396c5f9 Improve github templates
Add more contrast and change `you` to `I` in pull requests template.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-10 18:42:44 -05:00
Paul Callahan
0db41d0a92 add code and tests to detect vboxnet collision with host interfaces
+ exclude existing host-only nets from list of host interfaces
+ interface and mocks for system calls to net.*

Signed-off-by: Paul Callahan <paul.callahan@gmail.com>
2016-03-10 15:05:26 -08:00