Commit graph

25952 commits

Author SHA1 Message Date
Alicia Lauerman
39466e3144 add documentation for docker stack ps
also updates related stack docs and removes stack_tasks.md

Signed-off-by: Alicia Lauerman <allydevour@me.com>
(cherry picked from commit 970ab9a224)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-12 19:07:57 +01:00
milindchawre
073515574d
Fixes #27095 : Removing registrytoken field from doc as it is deprecated by identitytoken field
Signed-off-by: milindchawre <milindchawre@gmail.com>
(cherry picked from commit 72dd684c88)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-12 18:55:40 +01:00
Yong Tang
3707a30459 Update docs for node filter of docker service ps
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit c326e0afe3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-12 18:55:03 +01:00
Sebastiaan van Stijn
5dab892618
docs: add missing IPAM options to API docs
Commit dd28ded711
brought in new networking features and API, but
did not document the available IPAM options.

This adds a description of those options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d69fce79f9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-12 18:48:36 +01:00
Victor Vieux
f29c255b2c Merge pull request #29262 from tophj-ibm/update-1.12.x-go-bin
[1.12.x] ppc64le, use official go 1.6.4 binaries
2016-12-09 13:50:43 -08:00
Brian Goff
89da30c482 Merge pull request #29261 from andrewhsu/revert-pr-29188
Revert PR 29188 add selinux policy for centos-7 on 1.12.x branch
2016-12-08 20:36:33 -05:00
Christopher Jones
146400425e
[1.12.x] ppc64le, use official go 1.6.4 binaries
Use official go 1.6.4. binaries instead of downloading and building
from src

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-12-08 19:03:52 -05:00
Andrew Hsu
fe995bdfad Revert "add selinux policy for centos-7"
This reverts commit 7e30cb6e52.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-08 15:49:13 -08:00
Andrew Hsu
4b2b2c0af6 Revert "add extra docker.te lines from rhel7.3 docker.spec"
This reverts commit 5455138728.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-08 15:49:09 -08:00
Andrew Hsu
85aa678ad8 Revert "get rhel7.3 selinux-policy-devel pkg for centos-7"
This reverts commit 97b6626138.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-08 15:49:05 -08:00
Victor Vieux
0d5bc84d06 update changelog
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-07 13:47:58 -08:00
Victor Vieux
dbbcc8f549 Merge pull request #29141 from mlaventure/1.12.x-containerd-fifo
[1.12.x] Updated containerd to 751172f160d15c234ec4a92d43105326e1195d7e
2016-12-07 13:31:17 -08:00
Victor Vieux
c808ae8c5b Merge pull request #29220 from justincormack/go-up
[1.12] Update Go to 1.6.4
2016-12-07 13:28:02 -08:00
Justin Cormack
b7fe9bf7f5 [1.12] Update Go to 1.6.4
Golang security fix release

Note we still patch for darwin as this has not been merged in 1.6.4.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-07 11:42:29 -08:00
Victor Vieux
4a13581d57 Merge pull request #29204 from andrewhsu/changelog-date
[1.12.x] added date after version number in changelog
2016-12-07 11:19:17 -08:00
Andrew Hsu
86ef3fcbbb added date after version number in changelog
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-07 00:52:13 -08:00
Victor Vieux
caa6b86f38 Merge pull request #29187 from vieux/1.12.4-changelog
bump version and changelog for 1.12.4-rc1
2016-12-06 17:40:11 -08:00
Victor Vieux
b5e9291a70 Merge pull request #29188 from andrewhsu/fix-rhel73-for-1-12
add selinux policy for centos-7 on 1.12.x branch
2016-12-06 17:39:57 -08:00
Victor Vieux
bbe7ec7a0a bump version and changelog
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-06 17:37:58 -08:00
Andrew Hsu
97b6626138 get rhel7.3 selinux-policy-devel pkg for centos-7
Resolved conflict of bringing in this patch originally committed
to the 1.13.x branch. For this patch applied to the 1.12.x branch,
did not keep the photon case statement in generate.sh and did not
update to golang 1.7 in the centos-7/Dockerfile.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-06 11:18:21 -08:00
Andrew Hsu
5455138728 add extra docker.te lines from rhel7.3 docker.spec
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-06 11:14:53 -08:00
Andrew Hsu
7e30cb6e52 add selinux policy for centos-7
This policy is from commit
583a67ffdf

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-06 11:14:35 -08:00
Vincent Demeester
f966aae6ae Merge pull request #29150 from vieux/cherry_28026
[1.12.x]  a few cherry-picks
2016-12-06 10:17:23 +01:00
Victor Vieux
cce6065906 Merge pull request #29152 from aaronlehmann/cluster-object-1.12.x
[1.12.x] cluster: Refuse swarm spec not named "default"
2016-12-05 16:36:42 -08:00
Antonio Murdaca
e2b0adeb5c hack/make.sh: fix BUILDTIME
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 7b1f77dcbc)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-05 16:34:02 -08:00
Victor Vieux
9b70991d10 Merge pull request #29151 from cpuguy83/backport_volume_store_lock_fix
[1.12.x] backport fixes for volume store locking
2016-12-05 16:16:37 -08:00
Victor Vieux
c084bcd5fd Merge pull request #29146 from aboch/c1.12.x
[1.12.x] Porting libnetwork patch
2016-12-05 14:56:55 -08:00
Aaron Lehmann
e374126ed1 cluster: Refuse swarm spec not named "default"
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-05 14:54:51 -08:00
Andrew Hsu
9d7bae7c5d run dnf upgrade before installing in fedora
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit ebd804bfb6)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-05 14:54:45 -08:00
Stephen J Day
ed6b8d61c6 api/server/httputils: ensure consistent status code
Error code resolution is powered by string matching. Not the greatest
thing in the world and I hope no one is proud of this code, but it
works. However, because a map is used, the iteration order of the map is
random, such that if an error matches two of the snippets, it may return
a different error code depending on the seed of the hashmap. This change
converts it to use a slice instead.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 3484e02590)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-05 14:30:39 -08:00
Brian Goff
4da9f49339 re-vendor syslog log driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 00caf03132)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-05 14:24:39 -08:00
Brian Goff
0237ba30b6 backport fixes for volume store locking
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-05 17:23:53 -05:00
Boaz Shuster
d99532f55d Return an empty stats if the container is restarting
In case, a container is restarting indefinitely running
"docker stats --no-stream <restarting_container>" is suspended.

To fix this, the daemon makes sure the container is either not
running or restarting if `--no-stream` is set to true and if so
returns an empty stats.

Should fix #27772.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
(cherry picked from commit 786a95493d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-05 14:19:06 -08:00
Victor Vieux
560d0d25c1 Merge pull request #29093 from dmcgowan/backport-fix-27298
[1.12.x] Ensure opaque directory permissions respected
2016-12-05 13:46:44 -08:00
Victor Vieux
7613b23a58 Merge pull request #29083 from cpuguy83/fix_volume_rm_metadata
[1.12.x] Fix issue where volume metadata was not removed
2016-12-05 13:46:20 -08:00
Alessandro Boch
f54df35bc0 [1.12.x] Porting libnetwork patch
- Honor ICC setting for internal network

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-12-05 13:06:30 -08:00
Brian Goff
04825beac4 Fix issue where volume metadata was not removed
Basically, we create some on-disk metadata about the volume to store
things like volume labels.
This was never being cleaned up when the volume is removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-05 13:46:55 -05:00
Kenfe-Mickael Laventure
b01949b19a Updated containerd to 751172f160d15c234ec4a92d43105326e1195d7e
This adds the use of tonistiigi/fifo

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-05 09:53:18 -08:00
Victor Vieux
7b9deca3e0 Merge pull request #29095 from tonistiigi/1.12-io-fixes
[v1.12] backported IO fixes for v1.12
2016-12-05 00:45:03 -08:00
Vincent Demeester
a751f94ca0 Small log formatting fixes
… and clise to close 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 2f7e907846)
2016-12-02 18:10:25 -08:00
Tonis Tiigi
a2a983c770 Don’t warn on missing fifo
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit ee9d28bd3f)
2016-12-02 18:10:25 -08:00
Tonis Tiigi
06092267aa vendor: update fifo to fe870ccf2
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-12-02 18:10:16 -08:00
Tonis Tiigi
1e69caad8c Fix logging formatting
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit aa01ee4ac5)
2016-12-02 18:09:13 -08:00
Tonis Tiigi
e136d3ef93 Move stdio attach from libcontainerd backend to callback
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 37a3be2449)
2016-12-02 18:09:10 -08:00
Tonis Tiigi
7e98d12157 Refactor stdin closing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6f2658fb8c)
2016-12-02 18:09:06 -08:00
Alexander Morozov
c17155fbc3 libcontainerd: attach streams before create
Fix #26371

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 02d1934279)
2016-12-02 18:09:00 -08:00
Tonis Tiigi
6781d1912d Fix issues with fifos blocking on open
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6d26464502)
2016-12-02 18:08:57 -08:00
Victor Vieux
0c3e2e1556 Merge pull request #29089 from vieux/fix_plugin_tests
[1.12.x] "fix" plugin tests
2016-12-02 16:57:41 -08:00
Victor Vieux
f25e197379 Merge pull request #29004 from aboch/c1.12.x
[1.12.x] Porting libnetwork fixes
2016-12-02 16:28:26 -08:00
Derek McGowan
50841b16fe
Ensure opaque directory permissions respected
When converting an opaque directory always keep the original
directory tar entry to ensure directory is created with correct
permissions on restore.

Closes #27298

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-12-02 16:16:59 -08:00