docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit
ad538f6465 Add make test and other small cleanups 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-25 18:30:01 +00:00
Sebastiaan van Stijn
0fe4417a3b Merge pull request #22908 from vdemeester/7967-since-before-image-filters 
Add before and since filter to images
 2016-05-25 20:15:23 +02:00
David Calavera
60abc96acf Merge pull request #22943 from vdemeester/21769-fix-detach-keys 
Fix escape-keys by preserving input if invalid
 2016-05-25 09:53:53 -07:00
Vincent Demeester
004ce6b571 Merge pull request #22916 from duglin/FixNetTest 
Fix flaky TestApiStatsNetworkStats test
 2016-05-25 18:51:47 +02:00
John Howard
486a1a03d8 Windows: run -it not crash in ISE 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-25 09:50:18 -07:00
John Howard
541fba13fc Error login from non TTY 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-25 09:29:50 -07:00
John Howard
c7ee503082 Merge pull request #22958 from Microsoft/hcs_rpc 
Windows: Use the new HCS RPC API
 2016-05-25 09:25:22 -07:00
Sebastiaan van Stijn
8c70ab803c Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory 
Windows: Fix TestRunWorkingDirectory
 2016-05-25 17:54:39 +02:00
Brian Goff
53e2deb159 Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace 
Fix a race in pkg/integration.TestChannelBufferTimeout
 2016-05-25 11:35:23 -04:00
Sebastiaan van Stijn
4d376e9cc2 Merge pull request #22960 from justincormack/seccompdefnotarm 
Do not run the seccomp tests that use default.json on non x86 architectures
 2016-05-25 17:20:16 +02:00
Brian Goff
a41e823c1b Merge pull request #22969 from AkihiroSuda/fix22963LogRace 
Fix a race in daemon/logger.TestCopier
 2016-05-25 11:09:51 -04:00
Brian Goff
cef4ea0b97 Merge pull request #22966 from AkihiroSuda/fix22964MemRace 
Fix a race in pkg/discovery/memory
 2016-05-25 10:58:31 -04:00
Vincent Demeester
5bd6067b85 Merge pull request #22968 from mbentley/fix-dm-docs 
Fixed lost thin pool devicemapper docs
 2016-05-25 16:40:52 +02:00
Matt Bentley
0b8ea4387a Re-apply changes made in 24ec73f 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-05-25 08:46:39 -04:00
Matt Bentley
79205c3f06 Fix thin pool devicemapper docs overwritten 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-05-25 08:45:51 -04:00
Vincent Demeester
750e16f57c Add before and since filter to images 
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.

        $ docker images --filter before=myimage
        # display all images older than myimage
        $ docker images --filter since=myimage
        # display all images younger than myimage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-25 13:49:10 +02:00
Vincent Demeester
2a4b4a8133 Merge pull request #22962 from normalfaults/b 
fixed spelling error in windows.go
 2016-05-25 12:21:08 +02:00
John Starks
fa82c0aa10 Windows: work around Go 1.6.2/Nano Server TP5 issue 
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-25 11:59:28 +02:00
Stefan Scherer
f32ccb080a Update golang 1.6.2 for ARM 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-25 11:58:48 +02:00
Antonio Murdaca
40b21745cc Upgrade to golang 1.6.2 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-25 11:58:48 +02:00
Sebastiaan van Stijn
cd159fba85 Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix 
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
 2016-05-25 10:19:41 +02:00
Lei Jitang
5383824e08 Merge pull request #22974 from albers/completion-ps-filters 
bash completion for `docker ps -f {before,since}`
 2016-05-25 16:05:04 +08:00
Vincent Demeester
522698dd43 Merge pull request #22967 from srinsriv/master 
Update dind
 2016-05-25 09:55:10 +02:00
Harald Albers
c49d327406 bash completion for docker ps -f {before,since} 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-05-25 09:35:33 +02:00
Vincent Demeester
9f5a2c6e33 Merge pull request #22408 from yongtang/21976-allow-dns-and-net-host 
The option --dns and --net=host should not be mutually exclusive.
 2016-05-25 09:11:26 +02:00
Akihiro Suda
d0d828e292 Fix a race in pkg/integration.TestChannelBufferTimeout 
Update #22965

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-05-25 07:09:38 +00:00
Akihiro Suda
ab533f0651 Fix a race in daemon/logger.TestCopier 
Update #22963

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-05-25 05:07:24 +00:00
Akihiro Suda
1f8fbbc0d8 Fix a race in pkg/discovery/memory 
Fix #22964

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-05-25 04:01:43 +00:00
srinsriv
27afaf3774 Update dind 
Typo

Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
 2016-05-24 20:42:28 -07:00
Yong Tang
90bd41a74d The option --add-host and --net=host should not be mutually exclusive. 
This fix tries to address the issue raised in #21976 and allows
the options of `--add-host` and `--net=host` to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-24 18:49:11 -07:00
Nirmal Mehta
59bb86a964 Merge branch 'master' into b 2016-05-24 21:43:45 -04:00
Nirmal Mehta
f91acbaee4 fixed spelling error in docker cli run test 
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
 2016-05-24 21:43:22 -04:00
Nirmal Mehta
36a9151b27 fixed spelling error in windows.go 
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
 2016-05-24 21:40:08 -04:00
Ying Li
effa539600 Run rethink tests on another container 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-24 18:13:55 -07:00
Justin Cormack
75385dc216 Do not run the seccomp tests that use default.json on non x86 architectures 
The generated profile that we check in is for amd64 and i386 architectures
and does not work correctly on arm as it is missing required syscalls,
and also specifies the architectures that are supported. It works on
ppc64le at the moment but better to skip the test as it is likely to
break in future.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-24 17:47:30 -07:00
Ying Li
3a20b4d10b Bump docker version in CircleCI so we can run rethink integration tests 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-24 17:31:55 -07:00
Ying Li
4ca754a1e8 Rethink requires that each subsequent replica join another existant replica. 
Fix the compose file so that 2 and 3 join 1, otherwise the servers didn't
actually seem to be clustered.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-24 17:31:55 -07:00
French Ben
d93d8c40b5 Merge pull request #1701 from sibprogrammer/ip-mapping-links 
Fix ability to click on link on port mapping page (fix #1700).
 2016-05-24 16:45:38 -07:00
Darren Stahl
959c1a52bf Change Docker to use the new HCS RPC API 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-05-24 16:36:51 -07:00
Nishant Totla
8fd494ba58 Updating mock and nop clients for updated engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-24 16:27:10 -07:00
Yong Tang
23821fe586 The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive. 
This fix tries to address the issue raised in #21976 and allows
the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host`
to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-24 16:03:26 -07:00
John Howard
257494bd0a Windows: Fix TestRunWorkingDirectory 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-24 15:13:06 -07:00
David Lawrence
6b743aab30 Merge pull request #746 from docker/get-target-info 
Get all Target and Role data for a given target name
 2016-05-24 15:00:45 -07:00
Brian Goff
29dbcbad87 Merge pull request #22925 from jstarks/fix_integration_test 
pkg/integration: Port tests to Windows
 2016-05-24 17:31:43 -04:00
Christopher Jones
7832e2ae82 Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon 
Fixes the test by loading in the architecture specific busybox
image when the test daemon starts.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-05-24 16:33:49 -04:00
Joffrey F
4bb80c25d3 Merge pull request #3483 from aanand/env-disambiguation 
Add "disambiguation" page for environment variables
 2016-05-24 13:29:22 -07:00
Phil Estes
bdc06cf8f8 Merge pull request #22922 from justincormack/ppc64le-seccomp 
Enable seccomp on ppc64le
 2016-05-24 16:08:50 -04:00
Michael Crosby
0802401d22 Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted 
Remove unused mounted function in overlay
 2016-05-24 13:08:06 -07:00
Vincent Demeester
86a7632d63 Merge pull request #22091 from amitkris/build_solaris 
Get the Docker Engine to build clean on Solaris
 2016-05-24 21:41:36 +02:00
Vincent Demeester
fb48bf518b Move some container related methods and structs to smaller files 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-24 21:31:15 +02:00