1
0
mirror of https://github.com/docker/docs.git synced 2026-11-09 15:48:07 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Vincent Demeester
cd426ebed7 Add docs for label/env log-opts
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-13 08:39:47 +02:00
Tonis Tiigi
ef05b83417 Copy aufs hardlinks to top layer
Show warning if old method is used.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-12 20:44:32 -07:00
Kent Wang
da26cab450 Remove TerminalLogger.
Signed-off-by: Kent Wang <pragkent@gmail.com>
2015-10-13 11:31:46 +08:00
Ying Li
d545cdd3fd Merge pull request #210 from docker/client-side-config
Adding client-side root-ca server and server config
2015-10-12 18:46:40 -07:00
Ying Li
27e3d7e06c Update README with docker-machine instructions
Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 18:41:31 -07:00
Xian Chaobo
3fc52aa81d Merge pull request #1276 from aluzzardi/strategy-rankandsort
scheduler: Return a list of candidates rather than a single node.
2015-10-13 09:31:16 +08:00
Diogo Monica
b18e890e1c Changing the default config to point to notary-server
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-12 18:21:39 -07:00
Diogo Monica
70fe89f69c Adding check for relative VS full path
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-12 18:15:38 -07:00
Diogo Monica
11f823cf2a Changed README to reflect the new defaults
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-12 17:14:26 -07:00
Diogo Monica
8299e01b0a Fixed comments, changed default config
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-12 17:14:23 -07:00
Diogo Monica
c5e3580189 Added base signer Dockerfile, and changed base to be go 1.5.1
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-12 17:13:39 -07:00
Diogo Monica
aeb96f27a2 Adding client-side root-ca server and config
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-12 17:13:39 -07:00
Ying Li
85a447f701 Clean up SQLStorage docstring to refer to the model
Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 17:10:33 -07:00
Ying Li
4eaf6dc15c Add migrate to the sample mysql container
Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 16:50:25 -07:00
Ying Li
7fa991c3ff Gormizes the server database and make it SQL-DB agnostic.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 16:45:41 -07:00
Ying Li
75893ffed3 Merge pull request #211 from cyli/gormize-server-db-tests
Convert the server DB tests to use GORM with SQLite3 instead of sqlmock
2015-10-12 16:27:37 -07:00
Morgan Bauer
844fb29619 refactor use of container struct from daemon
- use Exists instead of Get
 - push Get inside of daemonbuilder

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-12 16:20:55 -07:00
Morgan Bauer
e4edd0bb88 docs additions
- add the unix socket, the default of the docker client
 - partially resolves #804

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-12 16:15:40 -07:00
Sharif Nassar
929595c7d1 Fix spelling
Signed-off-by: Sharif Nassar <sharif@mrwacky.com>
2015-10-12 16:11:30 -07:00
Ying Li
87ec8a25bf Use NULL DEFAULT NULL instead of NULL for timestamps
Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 16:03:56 -07:00
Aaron Lehmann
b07d759241 Add WithTag and WithDigest combinator functions
These functions allow a Named type to be combined with a tag or a
digest. WithTag will replace the ImageReference function in
github.com/docker/docker/utils as the Docker Engine transitions to the
reference package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-10-12 16:00:33 -07:00
Tibor Vass
9a13c2dc79 Merge pull request #16958 from tonistiigi/digest-collision
Make sure tags and digests don’t collide
2015-10-12 15:45:34 -07:00
Ying Li
e8528ec391 Attempt to match the model exactly up with the initial sql + the
migrate sql.

Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 15:44:00 -07:00
Tibor Vass
09ddb67dd4 Merge pull request #16962 from estesp/check-network-files-exist
Make sure network files exist before adding them to mounts
2015-10-12 15:38:51 -07:00
Jess Frazelle
df79536769 Merge pull request #16009 from azurezk/vol-create-conflict-option
volume create error on conflict option
2015-10-12 15:27:36 -07:00
Sebastiaan van Stijn
dc500630ec Merge pull request #16942 from physicalit/master
Add CMD and EXPOSE instruction example
2015-10-12 15:26:30 -07:00
moxiegirl
c59e24ff12 Merge pull request #16888 from dhiltgen/discovery_tls
Document updates for cluster-store-opt
2015-10-12 15:26:08 -07:00
Andrea Luzzardi
1d008a7ddd Merge pull request #1254 from dhiltgen/tls_kv
Add TLS support for libkv
2015-10-12 14:31:03 -07:00
Ying Li
1bb1f1acd2 Refactor server/storage models to use gorm.Model and to be in their
file.

Signed-off-by: Ying Li <ying.li@docker.com>
2015-10-12 14:28:20 -07:00
Tonis Tiigi
d08ca5c2b6 Make sure tags and digests don’t collide
Tags and digests are kept in the same storage. We want to make sure that they are completely separated - tags are something users set and digests can only be set by pull-by-digest code path.

Reverts #14664

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-12 14:20:11 -07:00
Phil Estes
ed68486f68 Make sure network files exist before adding them to mounts
It is possible that network files do not exist, especially in the case
of `--net=host` where a host OS (like CoreOS) does not use certain
standard network files.  This patch verifies that the source file of a
network mount point exists before adding it to the list of mount points
for bind mounting from the container's metadata directory.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-12 17:18:34 -04:00
Daniel Hiltgen
3661b6e63b Add TLS support for libkv
This adds TLS support into the KV store for swarm.  The manage, join,
and list commands all have a new CLI argument, matching the docker engine
discovery backend.  This required adding the tlsconfig utility
package from docker engine.

Here's an example showing re-use of the cluster certs for the KV store:

    swarm manage --tlsverify \
        --tlscacert /etc/docker/ssl/ca.pem
        --tlscert /etc/docker/ssl/cert.pem
        --tlskey /etc/docker/ssl/key.pem
        --discovery-opt kv.cacertfile=/etc/docker/ssl/ca.pem
        --discovery-opt kv.certfile=/etc/docker/ssl/cert.pem
        --discovery-opt kv.keyfile=/etc/docker/ssl/key.pem
        --advertise 192.168.122.47:3376
        etcd://192.168.122.47:2379

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-12 13:33:08 -07:00
Arnaud Porterie
96965e2abd Merge pull request #16954 from jfrazelle/update-changelog-master
Update changelog master
2015-10-12 12:31:15 -07:00
Jess Frazelle
eebf88ffd3 Merge pull request #16953 from aaronlehmann/master-security
Add 1.8.3 security fixes to master
2015-10-12 12:20:49 -07:00
Diogo Mónica
8b17a84aa0 Small fixes to the README 2015-10-12 12:14:50 -07:00
Diogo Mónica
ee8cb1e2cb Changed CircleCI location 2015-10-12 12:14:19 -07:00
Alexandre Beslic
cf83f1dc78 Merge pull request #1277 from mijia/rename_event
Engine should refresh the container on container rename event
2015-10-12 12:13:15 -07:00
Daniel Dao
0083f6e984 add labels/env log option for jsonfile
this allows jsonfile logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`.

Extra attributes are saved into `attrs` attributes for each log data.

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
Daniel Dao
11a24f19c2 add labels/env log option for journald
this allows journald logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
Daniel Dao
4cc8490283 add labels/env log option for fluentd
this allows fluentd logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
Daniel Dao
5794a0190d add labels/env log option for gelf
this allows gelf logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`

Additional log field will be prefixed with `_` as per gelf protocol
https://www.graylog.org/resources/gelf/

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
Daniel Dao
656cdbb0e9 add env and labels to log context
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
Jeffrey Morgan
c6655ab033 Bump Docker to 1.8.3
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-10-12 11:50:09 -07:00
Vincent Demeester
151564d39b Merge pull request #16904 from vikstrous/fish_completion_bug
fix fish completion wrong image names bug
2015-10-12 20:42:24 +02:00
Vincent Demeester
0b122dc55b Merge pull request #16914 from coolljt0725/add_userns_check
Add user namespace check to check-chonfig.sh
2015-10-12 20:39:46 +02:00
Jess Frazelle
6bacb32755 Merge pull request #16934 from sdurrheimer/zsh-completion-docker-network
Add zsh completion for 'docker network'
2015-10-12 11:29:57 -07:00
Nathan LeClaire
ebd45f5d9b Merge pull request #1966 from MarcelHarkema/feature/vmwarefusion-driver-configdrive-fix
Fix config drive support in VMware Fusion driver
2015-10-12 11:19:24 -07:00
Jessica Frazelle
01ca4f621d bump version back to 1.9.0-dev
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-12 11:18:28 -07:00
Jessica Frazelle
ec97bc9394 bump version for v1.8.3
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit f4bf5c7026816785d9f63c07e87f9450a49f2403)
2015-10-12 11:18:04 -07:00
Michael Crosby
8a71e005b4 Merge pull request #16951 from icecrime/maintainers_rm_fred
Remove fredlf from MAINTAINERS
2015-10-12 11:07:50 -07:00