beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32074 commits 14 branches 412 tags 338 MiB
Commit graph

32074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ying Li
b0401a71f7 Add the CACert parameter to the ExternalCA object in order to match 
swarmkit's API type.  Make sure this parameter gets propagated to
swarmkit, and also add an extra option to the CLI when providing
external CAs to parse the CA cert from a file.

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-04-26 10:45:12 -07:00
Vincent Demeester
e1101b1295 Merge pull request #32470 from runcom/remove-init-client 
remove --init-path from client
 2017-04-25 10:25:58 +02:00
Vincent Demeester
a3a109d956 Merge pull request #32341 from ripcurld0/tt_rm_ut 
Use a test table in the daemon delete unit tests
 2017-04-25 10:25:05 +02:00
Vincent Demeester
cf6dc6160a Merge pull request #32600 from dnephin/refactor-builder-dispatch-state 
Refactor builder dispatch state
 2017-04-25 09:32:23 +02:00
Aaron Lehmann
749d90e10f Merge pull request #32798 from stevvooe/tags-are-128-characters 
image/spec: tags are 128 characters
 2017-04-24 18:43:07 -07:00
Stephen J Day
c9beb417f4
image/spec: tags are 128 characters 
Mostly, they always have been. Most regular expressions were implemented
as `[\w][\w.-]{0,127]`, which actually allows 128 characters, since we
start with a character in the first expression.

This "fact" has been backported to the existing specifications where
length is mentioned. For the most part, no ill-effects should come of
this, unless someone has optimized to hold the length of a tag in a 7
bit integer.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-24 15:23:34 -07:00
Daniel Nephin
52626bb919 Reduce the number of calls to b.image 
In preparation for removing it from builder.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-24 14:21:19 -04:00
Daniel Nephin
e59327aaac Change builder.dispatchers to use a dispatchRequest object 
This change starts the process of splitting up the Builder into logical
components. Remove builder.flags and move it to the new dispatchRequest
object.

Use runConfig from dispatchRequest instead of from the builder.

More progress removing things from the Builder struct.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-24 14:21:19 -04:00
Tõnis Tiigi
3beb8d9c8b Merge pull request #32500 from dnephin/refactor-from-dispatcher 
Refactor from dispatcher
 2017-04-24 10:10:42 -07:00
Kenfe-Mickaël Laventure
8cb9d7ec2e Merge pull request #32685 from albers/completion-cleanup-1 
Remove bogus statement from bash completion
 2017-04-24 11:02:39 -05:00
John Howard
d0ce488d9d Merge pull request #32608 from darrenstahlmsft/WindowsNanoCPUs 
Windows: Fix scaling of NanoCPUs (--cpus) on Hyper-V containers
 2017-04-24 10:54:14 -05:00
Vincent Demeester
f9311c52ce Merge pull request #31912 from AkihiroSuda/ovl-on-non-swarm 
improve error of `docker network create -d overlay` on non-Swarm node
 2017-04-24 17:20:48 +02:00
Vincent Demeester
663f0ba1b2 Merge pull request #32248 from icapurro/cli-image-tests 
Unit tests for cli/command/image package
 2017-04-24 17:01:26 +02:00
John Howard
c22b21fede Merge pull request #32731 from hairyhenderson/one-line-swarm-join-output-32725 
Output `docker swarm join` command on a single line when running `docker swarm init`
 2017-04-24 09:53:16 -05:00
Ignacio Capurro
b2551c619d Unit tests for cli/commands/image (except build and tag) 
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
 2017-04-23 12:27:39 -05:00
Vincent Demeester
c264aefdac Merge pull request #32768 from dnephin/try-enable-test-matches-on-windows 
Enable TestMatches on windows
 2017-04-23 15:54:45 +02:00
Sebastiaan van Stijn
83ee902ecc Merge pull request #32740 from vdemeester/integration-trusted-cmd-cli 
Use `cli` for trusted related command
 2017-04-22 14:51:12 -07:00
Brian Goff
a709f79c1a Merge pull request #32654 from allencloud/use-make-slice-to-store-swarmkit-objects 
use make slice to store cluster objects to improve efficiency
 2017-04-22 12:02:34 -04:00
Misty Stanley-Jones
80013fd59a Merge pull request #32723 from alvin319/master 
Add examples of storage-opts and log-opts for the daemon
 2017-04-21 20:41:45 -05:00
Daniel Nephin
9484c3bd81 Enable a unit test on windows. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-21 12:31:16 -04:00
Tibor Vass
0e9148b1e9 Merge pull request #32761 from lukemarsden/clarify-moby-docker 
Clarify relationship between Moby and Docker.
 2017-04-21 07:58:57 -05:00
Luke Marsden
8fff9bd081 Clarify relationship between Moby and Docker. 
Signed-off-by: Luke Marsden <me@lukemarsden.net>
 2017-04-21 06:20:46 -05:00
Vincent Demeester
bb5dfdb8c5 Merge pull request #32632 from ColinHebert/compose_add_labels_during_build 
Add support for labels during build with compose
 2017-04-21 10:16:48 +02:00
Alvin Deng
427a521b02 Update dockerd.md 
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu>
 2017-04-20 21:56:21 -05:00
Solomon Hykes
7f927516ea Merge pull request #32691 from moby/moby 
Updated README: a new upstream project to break up Docker into independent components
 2017-04-20 17:32:32 -05:00
Solomon Hykes
252f7246a7 project: setting a new scope starting the Moby Project 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2017-04-20 17:25:19 -05:00
Solomon Hykes
d8413b86c0 Add Moby Project logo 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2017-04-20 17:03:21 -05:00
Vincent Demeester
b8e9250b59 Merge pull request #32668 from darrenstahlmsft/CleanupEmpty 
Windows: Do not clean empty windowsfilter folder
 2017-04-20 14:55:45 +02:00
Dave Henderson
50368e7a0e
Output docker swarm join on a single line 
This avoids issues when copy/pasting between different shells on
different OSes, which may not all support `\` as a continuation
character.

Fixes #32725

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2017-04-20 07:18:25 -05:00
Sebastiaan van Stijn
7936a962dc Merge pull request #32713 from vdemeester/integration-cli-move-fakegit 
[integration] Move fakegit to its own package in cli
 2017-04-19 20:30:47 -05:00
Alvin Deng
c79bf50ba6 Add examples of storage-opts and log-opts for the daemon 
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu>
 2017-04-19 16:35:47 -05:00
Vincent Demeester
a582d9dc42
[integration] Move fakegit to its own package in cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-19 15:52:03 +02:00
Vincent Demeester
b0ba39d431
Use cli for trusted relate command 
This also removed some skipped test (that are skipped for a long while).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-19 14:04:39 +02:00
Victor Vieux
4bcb02b785 Merge pull request #32692 from tiborvass/add-readme-header 
Add note about the transition to Moby in the README
 2017-04-18 10:06:24 -05:00
Tibor Vass
fe3797d986 Add note about the transition to Moby in the README 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-04-18 10:04:08 -05:00
Harald Albers
ee785b1b98 Remove bogus statement from bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-18 10:50:02 +02:00
Boaz Shuster
8f51746997 Use a test table in the daemon delete unit tests 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-04-18 10:30:40 +03:00
Vincent Demeester
3482b45e60 Merge pull request #32647 from vdemeester/integration-runSleepingContainer-using-cli 
[integration] make runSleepingContainer use cli package
 2017-04-18 08:35:55 +02:00
Tõnis Tiigi
cd4c089b9e Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8 
Vendor swarmkit 61a92e8
 2017-04-17 23:24:43 -05:00
Tõnis Tiigi
64932563c9 Merge pull request #32669 from darrenstahlmsft/FixTmpDelete 
Fix tmp deletion
 2017-04-17 23:13:54 -05:00
Darren Stahl
5e4e357f6e Windows: Do not attempt to clean empty windowsfilter folder 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-04-17 13:10:15 -07:00
Darren Stahl
5cea9a0aa5 Fix tmp folder deletion 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-04-17 13:09:40 -07:00
Daniel Nephin
f33f257888 Merge pull request #32666 from vdemeester/fix-test-unit 
Fix formatter unit test (moving to testify)
 2017-04-17 15:14:08 -04:00
Vincent Demeester
3f676c1918
Fix formatter unit test (moving to testify) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 17:32:52 +02:00
Daniel Nephin
1eec7b5583 Merge pull request #32614 from aaronlehmann/testify 
Remove pkg/testutil/assert in favor of testify
 2017-04-17 11:07:08 -04:00
Vincent Demeester
a9ff628a3c Merge pull request #32645 from thaJeztah/minor-fixes-for-history-format 
Minor fixups for history CLI reference
 2017-04-16 23:59:49 +02:00
Vincent Demeester
a899aa6796
[integration] make runSleepingContainer use cli package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-16 23:39:30 +02:00
Vincent Demeester
4850bc4df8 Merge pull request #32646 from thaJeztah/fix-markdown-indentation-level 
Fix markdown indentation level
 2017-04-16 22:01:29 +02:00
Aaron Lehmann
2b5ef9bfef integration-cli: Have TestSwarmJoinPromoteLocked wait for the role to change in the certificate 
Since the certificate may be renewed multiple times, this check is
necessary.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-16 12:42:21 -07:00
Sebastiaan van Stijn
bda69e6142
Fix markdown indentation level 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-16 12:56:00 -05:00