Commit Graph

21569 Commits

Author SHA1 Message Date
Madhu Venugopal 8edbd10349 Updating to the new ep.Delete API
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 20:42:37 -08:00
Madhu Venugopal 537089481f Vendor libnetwork v0.5.4
- Removed the isNodeAlive protection when user forces an endpoint delete

- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 20:42:30 -08:00
Kai Qiang Wu(Kennan) 6a04ecf813 Update response content for volume mounts
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-13 03:48:14 +00:00
Tonis Tiigi 42961a66a5 Avoid extracting to temp directory on building from tar
Fixes #15785

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-12 17:43:52 -08:00
Qiang Huang 7b616d4743 Do not fail if not support OomKillDisable
Fixes: #19278

The issue seems existed since we add support for OomKillDisable,
OomKillDisable support should not be hard request, we just
discard it if not support and move on.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-13 09:07:40 +08:00
Sebastiaan van Stijn 47d87d3b92 Merge pull request #19229 from mavenugo/udlinks
Local alias support
2016-01-12 16:47:32 -08:00
Tonis Tiigi 883be48930 Use bitmask for conflict checking
Rather than using 2 different functions for different
types of conflicts use a bitmask to specify what
conflicts need to be checked. This allows a better way
to make exceptions.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-12 16:01:56 -08:00
Tibor Vass 1e1a3c9508 Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
Fix rmi by ID untagging image on error
2016-01-12 18:56:25 -05:00
Tibor Vass 56272c9e9e Merge pull request #19060 from jfrazelle/daemon-read-seccomp
read seccomp profile locally then pass to daemon
2016-01-12 18:34:59 -05:00
David Calavera e5edc168a6 Complete documentation about extra container information.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 18:16:58 -05:00
David Calavera c0c66c57b2 Merge pull request #19170 from aaronlehmann/delete-prune-digests
Prune digest references when deleting by tag
2016-01-12 15:15:36 -08:00
Darren Shepherd 2aa673aed7 Lazy initialize Volume on container Mount object
Currently on daemon start volumes are "created" which involves invoking
a volume driver if needed.  If this process fails the mount is left in a
bad state in which there is no source or Volume set.  This now becomes
an unrecoverable state in which that container can not be started.  The
only way to fix is to restart the daemon and hopefully you don't get
another error on startup.

This change moves "createVolume" to be done at container start.  If the
start fails it leaves it in the state in which you can try another
start.  If the second start can contact the volume driver everything
will recover fine.

Signed-off-by: Darren Shepherd <darren@rancher.com>
2016-01-12 17:19:59 -05:00
David Calavera 09510c7c43 Merge pull request #19272 from sdurrheimer/zsh-completion-daemon-userns-remap
Add zsh completion for 'docker daemon --userns-remap'
2016-01-12 14:06:24 -08:00
Tonis Tiigi 38a45eed88 Fix rmi by ID untagging image on error
Do not untag image if it would later get a hard conflict because of running containers.

Fixes #18873

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-12 13:45:40 -08:00
Madhu Venugopal 2aa5f33b20 Docs update for link functionality in user-defined networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 13:38:48 -08:00
Madhu Venugopal e221b8a3d6 Support `--link` for user-defined networks
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 13:38:48 -08:00
Steve Durrheimer 54bea86b03 Add zsh completion for 'docker daemon --userns-remap'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-12 22:38:32 +01: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
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
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
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
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
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
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
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
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
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
Phil Estes cc63db4fd1 Add daemon documentation on user namespaces feature
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-11 20:54:57 -05:00
Phil Estes d5743a3a5c Properly report conflicting namespace options when using userns
This prevents strange errors and clarifies which namespace options are
incompatible with user namespaces (at this time).

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-11 20:50:22 -05:00
Sebastiaan van Stijn 3f1b16e236 Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port
Fix ambassador script
2016-01-11 17:41:53 -08:00
Sebastiaan van Stijn 656979670c Merge pull request #18998 from calavera/syslog_tls
Allow syslog over TCP+TLS.
2016-01-11 17:21:38 -08:00
Lei Jitang 79d4f0f56e Add docker network connect/disconnect to non-running container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-11 20:13:39 -05:00
Jess Frazelle acff8f7a9d Merge pull request #19248 from calavera/list_engine_api
List engine-api in the client libraries reference.
2016-01-11 16:40:12 -08:00
David Calavera bce01398dd List engine-api in the client libraries reference.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-11 19:17:13 -05:00
Kim Eik e732f4e649 Added additional container information to "docker info".
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
2016-01-11 19:14:44 -05:00
Tibor Vass 058e6dce18 Merge pull request #19247 from tiborvass/remove-tac
Make Makefile work on OS X
2016-01-11 19:13:55 -05:00
Jess Frazelle a96a0b3781 Merge pull request #19217 from justincormack/arm_syscalls
Add arm specific syscalls to default seccomp profile
2016-01-11 15:26:09 -08:00
Tibor Vass df40c61f8a Make Makefile work on OS X
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-11 18:16:56 -05:00
Alexander Morozov 5abef06a15 Fix race on reading endpoint data
Race is with its cleanup.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-11 14:28:07 -08:00
Jess Frazelle 9c9a1d1b4b Merge pull request #19069 from jfrazelle/apparmor-regex-proc
fix proc regex
2016-01-11 13:50:25 -08:00