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
Aanand Prasad
70cce961a8 Don't allow links or external_links in v2 files
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:45 +00:00
Aanand Prasad
9e17cff0ef Refactor API version switching logic
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:45 +00:00
Aanand Prasad
a027a0079c Use networking for version 2 Compose files
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:40 +00:00
Jessica Frazelle
062d0b3921 read seccomp profile locally then pass to daemon
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-12 13:12:29 -08:00
Jess Frazelle
c1582f20cc Merge pull request #19243 from calavera/engine_api_0_2
Vendor engine-api 0.2
2016-01-12 13:11:39 -08:00
Aanand Prasad
1a66543461 Make the default network name '{project name}_default'
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:08:28 +00:00
Aanand Prasad
b786b47bc8 Remove version checks from tests requiring API v1.21
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:08:28 +00:00
Aanand Prasad
0c626e63bc Merge pull request #2458 from dnephin/image_and_build_together
Image and build together
2016-01-12 21:08:00 +00:00
Steve Durrheimer
b59387401c Add zsh completion for 'docker-compose events'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-12 22:04:05 +01:00
jellin
6d41d8c1ad Allow Debug messages from ec2 driver to include request / response data sent to aws.
Signed-off-by: Jeffrey Ellin <jeff@ellin.com>
2016-01-12 15:39:07 -05:00
Aaron Lehmann
2f048f73e1 Prune digest references when deleting by tag
When pulling an image with content trust enabled, two references are
created: a digest reference and a tag reference. Deleting by tag
wouldn't actually remove the image, because the digest reference keeps
it alive.

This change modifies the rmi logic so that digest references don't keep
an image alive. If the last tag referencing a given image is deleted,
any digest references to it will be removed as well, so the image can
actually get deleted. This fixes the usability problem with deletions
when content trust is in use, so something like "docker pull busybox;
docker rmi busybox" will work as expected.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-12 12:11:43 -08:00
Nathan LeClaire
6cc068ee4a Merge pull request #2809 from smashwilson/unable-to-find-tenant
Rackspace: Only derive tenant ID if tenant name is supplied.
2016-01-12 11:58:38 -08:00
Nathan LeClaire
01c7556e3a Add docker-machine provision command
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-12 11:52:36 -08:00
Jess Frazelle
293b3767c8 Merge pull request #19245 from jfrazelle/seccomp-kernel-check
check seccomp is configured in the kernel
2016-01-12 11:33:27 -08:00
ajneu
c64117cbd7 documentation: debian/ubuntu need apt-transport-https ca-certificates
Signed-off-by: ajneu <ajneu@users.noreply.github.com>
2016-01-12 20:28:17 +01:00
Daniel Nephin
d32a3ec08f Merge pull request #2639 from dnephin/fix_pep8_errors
Fix pep8 errors from the new pep8 release.
2016-01-12 14:13:23 -05:00
Daniel Nephin
e98ab0e534 Allow both image and build together.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-12 14:10:00 -05:00
Daniel Nephin
ed4db542d6 Fix pep8 errors from the new pep8 release.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-12 14:02:30 -05:00
Aanand Prasad
9e36847eb9 Merge pull request #2637 from dnephin/fix_pre_commit_on_master
Fix pre-commit on master
2016-01-12 18:54:16 +00:00
Harald Albers
6c205a8e01 Add bash completion for docker-compose events
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-12 10:51:04 -08:00
Tibor Vass
45211af702 Merge pull request #19194 from LK4D4/fix_race_clean_net
Fix race on cleaning endpoint data
2016-01-12 13:28:50 -05:00
Daniel Nephin
12b5405420 Fix pre-commit on master.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-12 13:27:18 -05:00
David Calavera
db41c5f5a5 Update docker-py commit to the latest HEAD.
To fix issues with IPAM options.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:17 -05:00
Qiang Huang
f4a687334b Change OomKillDisable to be pointer
It's like `MemorySwappiness`, the default value has specific
meaning (default false means enable oom kill).

We need to change it to pointer so we can update it after
container is created.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
(cherry picked from commit 9c2ea42329179c589f5a8991ccf0253eb10fc897)

Conflicts:
	vendor/src/github.com/docker/engine-api/types/container/host_config.go
2016-01-12 13:19:17 -05:00
David Calavera
0627bf1a83 Do not force network disconnection.
Let that for a future flag.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:17 -05:00
David Calavera
ca60e6262b Vendor engine-api 0.2.1.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:16 -05:00
Daniel Nephin
304a44aeab Merge pull request #2585 from dnephin/short_signal_handlers
Fix signal handlers by moving shutdown logic out of handler
2016-01-12 12:55:53 -05:00
Sebastiaan van Stijn
1393c450cd Merge pull request #19104 from vdemeester/18957-update-config
Add a specific config struct for the update command (#18957)
2016-01-12 09:46:19 -08:00
Jessica Frazelle
40d5ced9d0 check seccomp is configured in the kernel
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-12 09:45:21 -08:00
David Gageot
2ac3ccca27 Bump toolbox version to 1.9.1i
Signed-off-by: David Gageot <david@gageot.net>
2016-01-12 18:44:07 +01:00
David Gageot
430a1d4ab1 Bump docker-machine to 0.5.6
Signed-off-by: David Gageot <david@gageot.net>
2016-01-12 18:44:07 +01:00
Sebastiaan van Stijn
c72be040bb Merge pull request #19187 from estesp/lets-do-this
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
Arnaud Porterie
664ba0ec0a Merge pull request #19053 from anusha-ragunathan/vendor-policy
Create standard vendor policies.
2016-01-12 08:32:06 -08:00
Aanand Prasad
52e50a9d9a Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key
Move logging config under separate key in v2 compose files
2016-01-12 15:21:10 +00:00
Sebastiaan van Stijn
301627c677 Merge pull request #18906 from coolljt0725/connect_to_created
Support network connect/disconnect to stopped container
2016-01-12 07:06:31 -08:00
Aanand Prasad
063a25ae7d Merge pull request #2392 from dnephin/docker_compose_events
docker-compose events
2016-01-12 11:45:27 +00:00
Victor Vieux
61142e4cbd update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 02:55:57 -08:00
Victor Vieux
6dcb170808 add buildtime, kernelversion and experimental to API version
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 02:55:53 -08:00
Abhijeet Kasurde
ac627fbb38 Updated documentation related to apt-cacher-ng
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2016-01-12 05:14:45 -05:00
Jean-Laurent de Morlhon
45a8f5e7a6 Returns exit code 3 on pre-create check
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-12 11:04:39 +01:00
Victor Vieux
14bf4e08b3 add -experimental to enable rescheduling
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 01:35:39 -08:00
Victor Vieux
fedf7aa4cb use "docker/swarm/nodes"
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 00:38:10 -08:00
Victor Vieux
31ad0e047f update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 00:38:09 -08:00
Victor Vieux
fc1e7bbca2 use docker/docker/pkg/discovery
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 00:38:06 -08:00
Mary Anthony
1bfdf55a52 Updating READMEs
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-12 00:34:57 -08:00
Wen Cheng Ma
0ba6a128ee Update the doc of build-bridges.md
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-12 15:52:33 +08:00
Alessandro Boch
cfa3682ca4 Account dcoker0 IPv6 address on daemon start
- In case --fixed-cidr-v6 is specified and docker0 bridge already
  has a global scope IPv6 address belonging to that v6 network
  (likely from a previous daemon instance), to maintain consistency
  with what done for the docker0 IPv4 address, daemon has to pass it
  down to libnetwork in the IPAMConfig as network gateway to make
  sure that the address is not given to some container.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-11 23:47:44 -08:00
Vincent Demeester
a4f6920731 Add a specific config for the update command
This allows to define clearly what is mutable or not in a container
and remove the use of the internal HostConfig struct to be used.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-12 08:33:41 +01:00
Qiang Huang
d104ddb564 Add DOCKER_BUILD_ARGS support for make build
We always need proxy for build, so we always use "docker build"
command instead of "make build", but now for some reasons, we need
macro defined in Makefile, so it would be helpful if we can use
"make build" without touching Dockerfile.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-12 15:15:17 +08:00
Sebastiaan van Stijn
3a866d3c11 Merge pull request #49 from HackToday/18698-fix-setup-doc
Add explanation for unexpected error msg
2016-01-11 18:21:40 -08:00