docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00
Code Activity
20,987 Commits 88 Branches 28 Tags
fb893cf6568f2b0cdf500bc3ecfb231fd374ffac
Commit Graph

20987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
fb893cf656 docs: add note to volume-plugins 
The /var/lib/docker directory is reserved for
docker, and should not be touched by plugins.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-04 18:28:14 +01:00
Sebastiaan van Stijn
db738dd77f Merge pull request #15666 from vdemeester/3519-configurable-escape 
Implement configurable escape key for attach/exec
 2016-01-04 00:49:07 +01:00
Vincent Demeester
15aa2a663b Implement configurable detach key 
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-03 23:03:39 +01:00
Sebastiaan van Stijn
2916ceb313 Merge pull request #19037 from moxiegirl/15666-file-carry 
Creating a man page for the configuration file
 2016-01-03 22:50:32 +01:00
Mary Anthony
32b5f71f0d Creating a man page for the configuration file 
Signed-off-by: Mary Anthony <mary@docker.com>

Adding comments. Fixing bit in daemon

Signed-off-by: Mary Anthony <mary@docker.com>

Arrrgggh

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-03 13:23:18 -08:00
Sebastiaan van Stijn
9d6c2196b5 Merge pull request #18387 from wenchma/18385-improve_help_msg 
Improvement for docker subcommand's help messages
 2016-01-03 12:19:53 +01:00
Tianon Gravi
29da9903d4 Merge pull request #19035 from albers/completion-authorization-plugins 
Compute plugin list in bash completion for `docker daemon --authz-plugin`
 2016-01-02 18:21:19 -08:00
Phil Estes
233787040c Merge pull request #19036 from calavera/thank_you_ian 
Thanks for everything Ian.
 2016-01-02 21:21:03 -05:00
David Calavera
e11ebfcb09 Add Ian Murdock to the names generator. 
❤️ 😢

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-02 19:17:17 -05:00
Harald Albers
2134d38935 Compute plugin list in bash completion for docker daemon --authz-plugin 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-02 14:53:10 -08:00
Sebastiaan van Stijn
dcbd5e04b7 Merge pull request #18891 from HackToday/18872-fix-volume-cmd 
Fix the restore data example
 2016-01-02 00:43:46 +01:00
Vincent Demeester
1a5b97c761 Merge pull request #18932 from wenchma/same_name_of_container_image 
Update integration tests when container and image have same name
 2016-01-01 21:40:51 +01:00
Arnaud Porterie
c431bcba5b Merge pull request #19028 from AvdN/patch-1 
fix typo
 2016-01-01 12:26:44 -08:00
Arnaud Porterie
838e4c86e8 Merge pull request #19027 from runcom/remove-getter 
daemon: info: remove exported getter
 2016-01-01 12:26:24 -08:00
Vincent Demeester
3544d48ca1 Merge pull request #19019 from duglin/constScratch 
Use constant instead of "scratch"
 2016-01-01 21:02:41 +01:00
Anthon van der Neut
b4d4a805ea fix typo 
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-01-01 20:39:04 +01:00
Antonio Murdaca
77ef3a606a daemon: info: remove exported getter 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-01-01 20:22:29 +01:00
Vincent Demeester
5c0af43ebe Merge pull request #19006 from jen20/f-solaris-stat 
Fix downstream client API build errors on Solaris
 2016-01-01 20:09:22 +01:00
Arnaud Porterie
e7c6206574 Merge pull request #19007 from aboch/npe 
Properly initialize IpamConf structure in initBridgeDriver
 2016-01-01 10:50:54 -08:00
Wen Cheng Ma
d7dc439623 Improvement for docker subcommand's help messages 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-01 12:27:28 +08:00
Brian Goff
e7e3e568d1 Merge pull request #18836 from vdemeester/18829-info-authz-plugins 
Add authorization plugins to docker info
 2015-12-31 09:47:59 -05:00
Doug Davis
e6806223e8 Use constant instead of "scratch" 
Move NoBaseImageSpecifier to a common spot and then use it instead of
"scratch" in a couple of places.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-12-31 06:21:56 -08:00
Sebastiaan van Stijn
d88e92d839 Merge pull request #19015 from timwangdev/patch-1 
🎉 Happy New Year!  🎉
 2015-12-31 14:26:10 +01:00
Tim Wang
4b32d59595 Update LICENSE date 
Signed-off-by: Tim <timwangdev@gmail.com>
 2015-12-31 13:07:35 +00:00
Kai Qiang Wu(Kennan)
83c705c00d Fix the restore data example 
Fixes: #18872

For backup, restore case, we usually restore in same directory, so
when we untar it, we not need go to /dbdata directory, wich could
result in /dbdata/dbdata, this fix make it untar directly. The directory
/dbdata would be same as old container /dbdata.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2015-12-31 00:56:01 +00:00
Alessandro Boch
aa97eee1a3 Properly initialize IpamConf structure in initBridgeDriver 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-12-30 15:44:50 -08:00
James Nugent
c12dbb8c82 Fix downstream client API build errors on Solaris 
The client API at fsouza/go-dockerclient has dependencies on packages in
the docker/docker repository which currently do not build on Solaris. In
particular, stat_unsupported.go makes use of the Mtimespec field of the
syscall.Stat_t struct, which is not present on Solaris, and a number of
Unix-specific packages do not list Solaris in their compile targets.

This commit adds enough support to be able to build
fsouza/go-dockerclient on SmartOS using Go 1.5.1 without affecting other
platforms.

Signed-off-by: James Nugent <james@jen20.com>
 2015-12-30 18:25:42 -05:00
David Calavera
102eb03c68 Merge pull request #18999 from tonistiigi/fix-comment-in-inspect 
Fix missing comment in docker inspect
 2015-12-30 15:07:04 -08:00
Jess Frazelle
83a194e2dd Merge pull request #19003 from calavera/fix_windows_build 
Move test out of the windows build.
 2015-12-30 14:37:28 -08:00
David Calavera
9aad7d209f Move test out of the windows build. 
Because it can still run on windows server and fail because it doesn't
have `chown`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-30 16:36:48 -05:00
Sebastiaan van Stijn
2c3d1a9b12 Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2 
Fix docs for memory-swap
 2015-12-30 21:01:48 +01:00
Tonis Tiigi
d32f43013b Fix missing comment in docker inspect 
Fixes #18571

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-12-30 11:52:53 -08:00
David Calavera
56f8b051eb Merge pull request #18158 from mauri/add_owner 
ADD files to a folder doesn't set correct UID and GID
 2015-12-30 11:19:15 -08:00
David Calavera
51fa287368 Merge pull request #18714 from jecarey/16756-docker_cli_pull_test 
Use of checkers in docker_cli_pull_test.go
 2015-12-30 10:00:41 -08:00
David Calavera
f962aac1ec Merge pull request #18991 from qq690388648/master 
replace the os.Stdout with stdout to adapt platform
 2015-12-30 09:55:02 -08:00
Sebastiaan van Stijn
3b605b5926 Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses 
fix incorrect ip addresses in networkingcontainers
 2015-12-30 17:49:08 +01:00
Jess Frazelle
3be1a80f1a Merge pull request #18987 from tianon/armhf 
Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets
 2015-12-30 08:21:52 -08:00
Arnaud Porterie
1dd4a2a966 Merge pull request #18994 from thaJeztah/add-new-impact-labels 
add new impact/distribution label
 2015-12-30 08:19:07 -08:00
David Calavera
708f98f5f9 Merge pull request #18952 from coolljt0725/fix_stats_update 
Fix docker stats show wrong memory limit when do docker update
 2015-12-30 08:17:42 -08:00
Sebastiaan van Stijn
9860effc4e Merge pull request #18984 from coolljt0725/fix_daemon_start 
Fix daemon failed to start with error "layer does not exist"
 2015-12-30 16:52:41 +01:00
Mauricio Garavaglia
b638bc6f17 Fix files ownership when ADD is used 
Signed-off-by: Mauricio Garavaglia <mauriciogaravaglia@gmail.com>
 2015-12-30 11:35:19 -03:00
Vincent Demeester
c4486e48f2 Merge pull request #18985 from hqhq/hq_handle_dockerCmdInDir 
Handle error for dockerCmdInDir
 2015-12-30 15:25:20 +01:00
Sebastiaan van Stijn
ac0180620d add new impact/distribution label 
Adds the new label to the documentation. The
impact/distribution label is intended for changes
that affect the image-format or interaction
with the registry (distribution).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-30 13:53:46 +01:00
Sebastiaan van Stijn
024eead82f Merge pull request #18925 from thaJeztah/please-dont-plus-one 
Be more explicit about "+1" comments
 2015-12-30 11:41:32 +01:00
qq690388648
1cb9b0745c replace the os.Stdout with stdout to adapt platform 
Signed-off-by: Sun Gengze <690388648@qq.com>
 2015-12-30 18:24:02 +08:00
Tianon Gravi
dc38061bee Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets 
Also, fix up some minor whitespace consistency issues, remove a little cruft, and update GOARM for armhf to 7 so that we're explicit.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-12-30 01:30:56 -08:00
Qiang Huang
1b34008532 Handle error for dockerCmdInDir 
Only two of these are not handled, the one in `TestBuildForceRm`
is intended to not be handled, while the other one in
`TestBuildResourceConstraintsAreUsed` causes problem.

In test case `TestBuildResourceConstraintsAreUsed`, somehow we
are not able to access network to get base image, but the error
message is:

```
Error: failed to inspect container : Unable to read inspect data: json: cannot unmarshal array into Go value of type types.ContainerJSON
```

Totally confusion.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-12-30 15:21:34 +08:00
Lei Jitang
72d3d1ef85 Fix daemon failed to start with error "layer does not exist" 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-12-30 14:19:31 +08:00
Brian Goff
135180bc4c Merge pull request #18981 from calavera/stop_using_sockets_package 
Remove pkg sockets and tlsconfig.
 2015-12-29 22:22:11 -05:00
Lei Jitang
518ed75e1a Fix docker stats show wrong memory limit when do docker update 
When a container create with -m 100m and then docker update other
cgroup settings such as --cpu-quota, the memory limit show by
docker stats will become the default value but not the 100m.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-12-29 20:33:16 -05:00