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
Arnaud Porterie
33a06a7f05 Merge pull request #19346 from albers/completion-detach-keys 
Completion and docs update for --detach-keys
 2016-01-14 14:40:44 -08:00
Joffrey F
1ae57d92d4 Remove duplicate functions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 14:39:06 -08:00
Brian Bland
6309947718 Changes cross-repository blob mounting to a blob Create option 
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
 2016-01-14 14:26:03 -08:00
Ying Li
c65fc03ef9 Update test to make x509 keys start a day in the past. 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-01-14 14:15:38 -08:00
Aanand Prasad
ee7a51c179 Merge pull request #2650 from dnephin/interpolate_config_in_volumes 
Interpolate variables in the new sections of the Compose file
 2016-01-14 22:04:46 +00:00
Harald Albers
3bf821054e Document that detach keys are a list of key bindings 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 13:58:41 -08:00
Jessica Frazelle
61553fc2f5 WIP: Update security docs for seccomp/apparmor 
Signed-off-by: Mary Anthony <mary@docker.com>

Updaing and slight re-arrangement of security information

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

Updating security files

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

Updating links to the security documentation

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

removing some extra spaces

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

Correcting spelling

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-14 13:58:37 -08:00
Tibor Vass
9365b301a8 Merge pull request #19339 from cpuguy83/19335_revert_18736 
Revert "Break big lock into some tiny locks"
 2016-01-14 16:53:39 -05:00
Tianon Gravi
9b2aab3fc8 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included 
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-01-14 13:51:30 -08:00
Brian Goff
3b6a989d81 Merge pull request #19325 from mingqing/fix-pid-convert-error 
fix pidfile, pid is num use '/proc + string(pid)' can't found it
 2016-01-14 16:49:20 -05:00
Harald Albers
b24ded193f bash completion for --detach-keys 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 13:47:20 -08:00
David Calavera
677a6b3506 Allow to set daemon and server configurations in a file. 
Read configuration after flags making this the priority:

1- Apply configuration from file.
2- Apply configuration from flags.

Reload configuration when a signal is received, USR2 in Linux:

- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-14 16:44:37 -05:00
Tibor Vass
e35f5a481a Merge pull request #17316 from rmb938/ipam_conf_options 
Add IPAM Config Options to match libnetwork
 2016-01-14 16:30:03 -05:00
Clemens Gutweiler
ce9f2681a2 Fixes #1422: ipv6 addr contains colons, so we split only by the first char. 
Signed-off-by: Clemens Gutweiler <cg@vioma.de>
 2016-01-14 22:26:35 +01:00
Victor Vieux
7b142f5642 Bump version to 1.1.0-rc1 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-01-14 13:21:48 -08:00
Arnaud Porterie
0f2ba97a78 Merge pull request #19343 from Microsoft/jjh/dockerfilenote 
Add note in dockerfile about go version
 2016-01-14 13:11:03 -08:00
John Howard
6ca5a2c476 Windows: Remove linkmode internal hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-14 13:09:28 -08:00
David Calavera
d299bbfcc6 Merge pull request #19342 from Microsoft/jjh/fix19316 
Windows: Fix test regression from 19155
 2016-01-14 13:05:47 -08:00
David Calavera
db2b5e647c Merge pull request #19338 from aboch/vnd 
Vendoring libnetwork v0.5.5
 2016-01-14 13:02:20 -08:00
Jess Frazelle
7a44265129 Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog 
Remove the changelog auto-generation
 2016-01-14 12:47:32 -08:00
John Howard
6c1382e151 Add note in dockerfile about go version 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-14 12:20:19 -08:00
Joffrey F
13063a96cb Fix handling of service.dockerfile key 
Made invalid in v2 format
Doesn't break build config anymore

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 12:15:37 -08:00
Garrett Heel
9cfa71ceee Add support for build arguments 
Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
 2016-01-14 12:14:56 -08:00
Daniel Nephin
77b4ebc31f Merge pull request #2591 from moxiegirl/remove-todo 
Fixing TODO visible in docs
 2016-01-14 15:06:38 -05:00
John Howard
d3392a3bde Windows: Fix test regression from 19155 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-14 12:00:27 -08:00
Jeffrey Morgan
8ddff7740f Correct asset names on circleci 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2016-01-14 11:52:15 -08:00
Jeffrey Morgan
1366a0c153 Update Kitematic curl url 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2016-01-14 11:46:51 -08:00
Jeffrey Morgan
457a300e8b Merge branch 'master' of github.com:docker/toolbox 2016-01-14 11:43:40 -08:00
Jeffrey Morgan
fc96c56353 Fix asset name in circleci 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2016-01-14 11:43:35 -08:00
Ryan Belgrave
662cac08ef Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2016-01-14 14:32:25 -05:00
Arnaud Porterie
3ce3fb7417 Merge pull request #19333 from wzyboy/patch-1 
Update CHANGELOG.md
 2016-01-14 11:21:32 -08:00
Richard Scothern
1cdc683358 Merge pull request #1352 from tpounds/use-go-1.5.3 
Use Go 1.5.3
 2016-01-14 11:17:54 -08:00
Jeffrey Morgan
d07f0f9022 Merge pull request #369 from dgageot/machine-0.5.6 
Bump Docker Machine 0.5.6
 2016-01-14 11:17:06 -08:00
Derek McGowan
cb08de17d7 Merge pull request #1351 from BrianBland/splitBlobCreateOptions 
Splits up blob create options definitions to be package-specific
 2016-01-14 11:10:54 -08:00
Daniel Nephin
79df2ebe1b Support variable interpolation for volumes and networks sections. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 14:04:57 -05:00
Madhu Venugopal
7481961009 IT for restart-policy and DNS based SD in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 11:03:26 -08:00
Victor Vieux
f883a6d508 Merge pull request #1637 from jimenez/launch_bad_timeout 
Launch bad timeout
 2016-01-14 11:01:45 -08:00
Brian Goff
7cd6210a88 Merge pull request #19326 from HackToday/19153-filter-rethink 
Fix image filter
 2016-01-14 13:59:14 -05:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Ying Li
f57f2beb08 Factor marshalling a SignedRoot into JSON into TUF/data/root.go, and 
add an injectable serializer (so we can test JSON marshalling/unmarshalling
error propagation).

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-01-14 10:51:24 -08:00
Ying Li
b74f1835b7 Ensure that we do not unnecessarily re-sign/serialize a root.json file on publish 
Adds additional tests to ensure that keys aren't unnecessarily created on error,
and that only the required keys to sign are used.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-01-14 10:51:24 -08:00
Santhosh Manohar
5347f7cd94 Vendoring libnetwork v0.5.6 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-14 10:48:48 -08:00
Brian Bland
8c5a6c13c0 Splits up blob create options definitions to be package-specific 
Redefines privately in both storage and client packages

Signed-off-by: Brian Bland <brian.bland@docker.com>
 2016-01-14 10:47:33 -08:00
Harald Albers
fca3e47a75 bash completion for docker-compose up --abort-on-container-exit 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 10:43:53 -08:00
Trevor Pounds
e5ac03f945 Update to Go 1.5.3. 
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
 2016-01-14 10:40:20 -08:00
Brian Goff
f093e1273d Revert "Break big lock into some tiny locks" 
This reverts commit 1326f0cba5.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-14 13:38:09 -05:00
Isabel Jimenez
a99ceeb9c1 Adding suicide logic for tasks so as to prevent false timeout for tasks having a long image pull 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2016-01-14 13:37:23 -05:00
Isabel Jimenez
d12ea7ff6d Adding test 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2016-01-14 13:37:23 -05:00
Alessandro Boch
4e4ba9dd3a Vendoring libnetwork v0.5.5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-14 10:34:00 -08:00
Aanand Prasad
3750811eed Merge pull request #2564 from aanand/2478-networks-in-compose-file 
Declare networks in Compose file
 2016-01-14 18:32:29 +00:00