1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Daniel Nephin
e317d2db9d Remove service.start_container()
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:39 -05:00
Joffrey F
3daecfa8e4 Update service config_dict computation to include volumes_from mode
Ensure config_hash is updated when volumes_from mode is changed, and
service is recreated on next up as a result.

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-12 13:54:39 -05:00
Aanand Prasad
cf93362368 Fix parallel output
We were outputting an extra line, which in *some* cases, on *some*
terminals, was causing the output of parallel actions to get messed up.

In particular, it would happen when the terminal had just been cleared
or hadn't yet filled up with a screen's worth of text.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-11-12 13:54:39 -05:00
Daniel Nephin
23d4eda2a5 Fix service recreate when image changes to build.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:39 -05:00
Daniel Nephin
718ae13ae1 Move config hash tests to service_test.py
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:39 -05:00
David Gageot
7a4915e999 Merge pull request #2249 from nathanleclaire/create_help_docs_and_nits
Update flag help explanation and VirtualBox version line
2015-11-12 19:40:53 +01:00
Daniel Nephin
9c305ac10f Remove name field from the list of ALLOWED_KEYS
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:26:13 -05:00
Paolo G. Giarrusso
6b02876362 Replace now broken link with a "permalink"
Fix #17927.

Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2015-11-12 19:17:29 +01:00
Aaron Lehmann
64f8ee444d Cap the amount of buffering done by BytesPipe
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.

Adjust tests to work with the blocking Read and Write functions.

Remove BufReader, since now its users can use BytesPipe directly.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-12 10:11:29 -08:00
Tonis Tiigi
18c7c34d4b Fix docker pull on windows
Exceptions for the windows base layer handling.
    
    
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-12 10:04:53 -08:00
Daniel Nephin
cddbe9fbf1 Merge remote-tracking branch 'docker/release' into bump-1.5.1 2015-11-12 13:03:47 -05:00
Tianon Gravi
8b9856dbd7 Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
update release script and release process
2015-11-12 09:51:36 -08:00
Daniel Nephin
589755d034 Inclide the filename in validation errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 12:44:45 -05:00
Daniel Nephin
fa96484d28 Refactor process_errors into smaller functions
So that it passed new max-complexity requirement

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 12:44:24 -05:00
Daniel Nephin
f7d8087694 Add ids to config schemas
Also enforce a max complexity for functions and add some new tests for config.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 12:40:36 -05:00
Jean-Laurent de Morlhon
34cd4fd898 Merge pull request #2250 from jeanlaurent/2204-broken-env-unset
Fix for docker-machine env unset
2015-11-12 18:05:05 +01:00
Jean-Laurent de Morlhon
fe37f1fb0d Fix #2204 broken env unset
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-12 17:32:27 +01:00
Vincent Demeester
ce29a8cc37 Merge pull request #17200 from maaquib/16756-integration-cli-events-test
Using checkers assert for integration-cli/docker_cli_events_test.go
2015-11-12 16:43:12 +01:00
David Calavera
fc36475184 Merge pull request #17898 from zelahi/16756-createtest-dockercli
changed if  else statements to c.Asserts in docker_cli_create_test.go.
2015-11-12 07:37:29 -08:00
Sebastiaan van Stijn
06a4e5f981 Docs: improve caching for make docs
Use caching for all other repositories, instead
of doing a svn checkout each time.

This may result in showing  outdated docs
for other repositories, but --no-cache can be
used if the latest docs are needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 16:30:40 +01:00
David Calavera
8cf38b6a8b Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
Refactor ProcessConfig
2015-11-12 07:28:32 -08:00
David Gageot
9dd438e1f6 Merge pull request #2264 from dgageot/2255-fix-in-container-build
FIX #2255 - make cross should copy binaries
2015-11-12 16:20:21 +01:00
David Gageot
f38d8efb3b Merge pull request #2268 from dgageot/ci
Build linux/darwin/windows on Travis
2015-11-12 16:17:06 +01:00
David Calavera
eed704f7d9 Merge pull request #17901 from runcom/remove-not-needed-func
hack: make.sh: remove not used function
2015-11-12 07:16:43 -08:00
Poul Kjeldager Sørensen
5935867213 updated instruction to correct file path
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz>
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net>
2015-11-12 16:15:29 +01:00
Dan Walsh
d1ae13b0b0 Define all of the signals defined by kill -l
1) SIGHUP	 2) SIGINT	 3) SIGQUIT	 4) SIGILL	 5) SIGTRAP
 6) SIGABRT	 7) SIGBUS	 8) SIGFPE	 9) SIGKILL	10) SIGUSR1
11) SIGSEGV	12) SIGUSR2	13) SIGPIPE	14) SIGALRM	15) SIGTERM
16) SIGSTKFLT	17) SIGCHLD	18) SIGCONT	19) SIGSTOP	20) SIGTSTP
21) SIGTTIN	22) SIGTTOU	23) SIGURG	24) SIGXCPU	25) SIGXFSZ
26) SIGVTALRM	27) SIGPROF	28) SIGWINCH	29) SIGIO	30) SIGPWR
31) SIGSYS	34) SIGRTMIN	35) SIGRTMIN+1	36) SIGRTMIN+2	37) SIGRTMIN+3
38) SIGRTMIN+4	39) SIGRTMIN+5	40) SIGRTMIN+6	41) SIGRTMIN+7	42) SIGRTMIN+8
43) SIGRTMIN+9	44) SIGRTMIN+10	45) SIGRTMIN+11	46) SIGRTMIN+12	47) SIGRTMIN+13
48) SIGRTMIN+14	49) SIGRTMIN+15	50) SIGRTMAX-14	51) SIGRTMAX-13	52) SIGRTMAX-12
53) SIGRTMAX-11	54) SIGRTMAX-10	55) SIGRTMAX-9	56) SIGRTMAX-8	57) SIGRTMAX-7
58) SIGRTMAX-6	59) SIGRTMAX-5	60) SIGRTMAX-4	61) SIGRTMAX-3	62) SIGRTMAX-2
63) SIGRTMAX-1	64) SIGRTMAX

This will allow users to specify signals by name.  Needed to make docker run --stop-signal
work as defined by systemd.

man systemd

defines the proper way to shutdown a systemd running as pid 1 in a container as

SIGRTMIN+4

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-12 09:55:18 -05:00
Denis Gladkikh
26855c7801 Allow configurable metadata for Splunk log driver
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-11-12 06:36:51 -08:00
Petri Sirkkala
2ba581d469 Merge remote-tracking branch 'docker/master'
Signed-off-by: Petri Sirkkala <sirpete@iki.fi>
2015-11-12 16:07:46 +02:00
David Gageot
98abeddf3b Fix cross-platform CI
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 15:07:14 +01:00
David Gageot
8f7ceb1c48 Add missing golang.org/x/sys dep.
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 15:06:24 +01:00
David Gageot
466d59d634 Simplify dep-restore target
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 15:05:57 +01:00
Jean-Laurent de Morlhon
40d153145f Fix for #2244
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-12 13:49:43 +01:00
Sven Dowideit
9c6e3396ef Merge pull request #17631 from sallyom/docker-login-non-root
clarify docker login
2015-11-12 22:39:35 +10:00
Sally O'Malley
f9657819cd docker-login man/doc add security info
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-12 07:25:35 -05:00
Sven Dowideit
715ddd6ee5 Merge pull request #17938 from thaJeztah/fix-docs-run-reference-link
docs: fix link to "run reference"
2015-11-12 22:09:56 +10:00
Sebastiaan van Stijn
f2705fa6ed docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 12:38:46 +01:00
David Gageot
065b6976da Merge pull request #2265 from dgageot/2262-ci-build-all-targets
Build on all platforms
2015-11-12 11:47:04 +01:00
Brian Goff
7d783ea5eb Merge pull request #17934 from sdurrheimer/zsh-completion-run-create-volume-driver
Add zsh completion for 'docker {run,create} --volume-driver'
2015-11-12 05:41:41 -05:00
Brian Goff
b6899ad56f Merge pull request #17923 from LK4D4/simple_ckill
daemon/kill.go: simplify if statement
2015-11-12 05:36:40 -05:00
David Gageot
e2410d435c Run CI for linux/osx/windows
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 10:54:13 +01:00
David Lawrence
45de2828b5 Merge pull request #271 from docker/adding-pkcs11-signed
Adding pkcs11 signed
2015-11-12 01:40:38 -08:00
Diogo Monica
d2f69fe5bc Adding another path to search for ykcs libs
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-11-12 01:22:40 -08:00
Diogo Mónica
42cc828865 Merge pull request #56 from docker/last-stuff
Some more tests, one minor change

Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Mónica <diogo.monica@gmail.com> (github: endophage)
2015-11-12 01:14:05 -08:00
Ying Li
5d0893ef2a Oops, it'd be helpful if we actually ran the new CryptoService tests.
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
2015-11-12 01:14:01 -08:00
Ying Li
87231d9a5d Fix new bug where adding a duplicate key to a yubikey added to the backup.
Added a test for this case as well - thanks @endophage!

Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
2015-11-12 01:13:58 -08:00
Ying Li
43f2d40e43 Make our CI pick up trustmanager/yubikey again
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
2015-11-12 01:13:55 -08:00
Ying Li
efff721955 Add tests for multi-keystore crypto services.
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
2015-11-12 01:13:49 -08:00
Ying Li
6cf0643d7d Roll back an add key to the yubikey if we can't back it up.
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
2015-11-12 01:13:46 -08:00
Ying Li
96bfaac05f Add tests for verifying signatures before returning a signature.
Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Ying Li <ying.li@docker.com> (github: endophage)
2015-11-12 01:13:43 -08:00
Diogo Mónica
a51f380418 Merge pull request #51 from docker/more-yubikey-tests
more yubikey tests

Signed-off-by: David Lawrence <david.lawrence@docker.com>

Signed-off-by: Diogo Mónica <diogo.monica@gmail.com> (github: endophage)
2015-11-12 01:13:40 -08:00