dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 17:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,858 Commits 19 Branches 592 Tags
v1.12.2
Commit Graph

25858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux
bb80604a0b Bump VERSION to v1.12.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
v1.12.2 		2016-10-11 05:23:52 +00:00
Kenfe-Mickaël Laventure
91d8560fc0 Merge pull request #27216 from andrewhsu/add-missing-changelog 
add changelog lines for swarmkit and libnetwork
 2016-10-10 07:32:00 -07:00
Andrew Hsu
feb59d32d7 add changelog lines for swarmkit and libnetwork 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-10-07 13:10:44 -07:00
Victor Vieux
cb0ca64a34 Bump VERSION to v1.12.2-rc3 
Signed-off-by: Victor Vieux <vieux@docker.com>
v1.12.2-rc3 		2016-10-06 21:27:01 +00:00
Victor Vieux
841c5f9166 update changelog 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-06 14:26:27 -07:00
Tibor Vass
026f385aa3 install: fix debian stretch 
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 047264763a)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-06 14:24:36 -07:00
Victor Vieux
1863675001 Merge pull request #27196 from mlaventure/update-containerd-1.12.x 
[1.12.2] Update containerd and runc
 2016-10-06 11:46:20 -07:00
Kenfe-Mickael Laventure
3377b4b9b7 Update containerd and runc 
containerd: 0366d7e9693c930cf18c0f50cc16acec064e96c5
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-06 09:28:08 -07:00
Brian Goff
d82e3bf952 Merge pull request #27180 from aboch/c1.12.x 
Vendoring libnetwork & swarmkit to address #27147
 2016-10-06 15:50:53 +02:00
Alessandro Boch
cb58783630 Vendoring libnetwork & swarmkit to address #27147 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-10-05 21:16:04 -07:00
Victor Vieux
d72629e18f add awscli to arm Dockerfile 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit dbec45fa7a)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-04 18:46:58 -07:00
Victor Vieux
ad9538afc2 Bump VERSION to v1.12.2-rc2 
Signed-off-by: Victor Vieux <vieux@docker.com>
v1.12.2-rc2 		2016-10-04 05:37:23 +00:00
Victor Vieux
545d909aac Merge pull request #27079 from vieux/cherry-picks-and-changelog-1.12.2 
Cherry-picks and Changelog 1.12.2-rc2
 2016-10-03 22:34:24 -07:00
Victor Vieux
0e7c6b8496 Merge pull request #27120 from mavenugo/vin_ln 
Vendoring libnetwork 9fc9609b
 2016-10-03 15:42:24 -07:00
Madhu Venugopal
d11648696f Vendoring libnetwork 9fc9609b 
Cherry-picking fix for #27109

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-10-03 12:09:45 -07:00
Kenfe-Mickael Laventure
5d04e28d9e Remove amd64 assumption in release.sh, cross and tgz scripts 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 61335bcb03)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-01 02:47:49 -07:00
alexchen
1767966502 add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT CONFIG_IP_VS_RR in contrib/check-config.sh 
Signed-off-by: alexchen <alexchenunix@gmail.com>
(cherry picked from commit 4c74469d30)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-01 02:15:25 -07:00
Vincent Demeester
5aa44019b0 Merge pull request #27077 from LK4D4/update_swarmkit 
vendor: update swarmkit for 1.12.2
 2016-10-01 10:39:54 +02:00
allencloud
180d122c5b make remove network return 204 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit ea07ef7a7c)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-30 22:49:20 -07:00
allencloud
9975fcbe1c add lock in libcontainerd client AddProcess 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 278273bc16)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-30 21:47:33 -07:00
Victor Vieux
1c0d9a4a90 Update date for 1.12.2-rc2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-30 14:57:34 -07:00
Daniel Nephin
458bd3663b Use ListOpt for labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 6c3b44f755)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-30 14:56:13 -07:00
Justin Cormack
64ae81609c Run seccomp tests in series not parallel 
Fix #24803 as this had been failing sometimes.

As the parallel tests are probably genuine failures, and
had already been cut down, I will re-create these specifically
as a parallel execution test with no seccomp to make the
cause clearer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 84ec04306c)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-09-30 14:30:47 -07:00
Alexander Morozov
d29db3a55a vendor: update swarmkit for 1.12.2 
This includes:
docker/swarmkit#1588
docker/swarmkit#1592
docker/swarmkit#1594

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-30 14:18:45 -07:00
Sebastiaan van Stijn
0a6b4c2d9c Merge pull request #27048 from thaJeztah/disable-api-1.25 
[1.12.x] Hide API v1.25 docs
 2016-09-29 23:33:35 +02:00
Sebastiaan van Stijn
d49c31e3c1 Hide API v1.25 docs 
API v1.25 is for Docker 1.13. Commit
4da24ca1e3 was meant
to put it in draft mode, but added this
option in the "menu" section.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 23:18:12 +02:00
Misty Stanley-Jones
3134c23b55 Merge pull request #27040 from mstanleyjones/fix_labels_nav_pick 
Merge pull request #27036 from mstanleyjones/fix_labels_nav
 2016-09-29 11:12:42 -07:00
Misty Stanley-Jones
a114655b56 Merge pull request #27036 from mstanleyjones/fix_labels_nav 
Fix menu position of the labels-custom-metadata.md topic
(cherry picked from commit a3286783bc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-29 11:05:34 -07:00
Sebastiaan van Stijn
88ce3d60b9 Merge pull request #27032 from mstanleyjones/fix_image_link_pick 
Merge pull request #27031 from mstanleyjones/fix_broken_image_link
 2016-09-29 19:27:49 +02:00
Sebastiaan van Stijn
ed69445474 Merge pull request #27031 from mstanleyjones/fix_broken_image_link 
Revert "Add direct link to event chart image"
(cherry picked from commit 6f07a4a69b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-29 10:23:10 -07:00
Sebastiaan van Stijn
cd15b2b300 Merge pull request #27022 from thaJeztah/docs-cherry-picks-1.12.2 
Docs cherry picks 1.12.2
 2016-09-29 17:58:12 +02:00
Misty Stanley-Jones
68aca71637 Fix link to non-existent file 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ca04f02d76)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:29:07 +02:00
Victoria Bialas
735622fdf4 added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0a76a4cb5b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:29:00 +02:00
Sebastiaan van Stijn
ca474f7808 Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fd7161bb30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:52 +02:00
allencloud
c93303b8d7 move mcvlan out of experimental docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 6e4ec046f4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:35 +02:00
yuexiao-wang
96b5ec8f50 Fix the broken link 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit cfb07e642d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:29 +02:00
yuexiao-wang
394ce0c9c1 Fix typo for how pki works 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit bf9c6d3115)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:22 +02:00
lixiaobing10051267
729717568b the network id is not consistant with the real id created 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 392aae44fd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:16 +02:00
Sebastiaan van Stijn
fc884da817 Add missing API docs for "privileged" and "user" exec 
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.

This adds the missing API docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c53efdf4c1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:09 +02:00
Hans Kristian Flaatten
9363b42e59 docs: add missing 'on' in Oracle installation guide 
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com>
(cherry picked from commit 838fe65e53)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:02 +02:00
Jeff Silberman
2659333a27 Add Portworx Volume Plugin Description 
Signed-off-by: Jeff Silberman <jsilberm@gmail.com>
(cherry picked from commit da2159ea1c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:55 +02:00
Misty Stanley-Jones
67610e9dea Restructure content about Docker object labels 
A few points of work:

- Took the topic out of the left-hand nav and made it
  reachable from the User guide intro

- Condensed the topic's contents, presenting only conceptual
  info and pointing instead to the command-line references
  for each type of object

- Added brief information about the `LABELS` keyword to the
  Dockerfile reference

A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 5c4c062ffc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:48 +02:00
Sebastiaan van Stijn
121cd6f9e6 Fix incorrectly named API options 
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 36a25bdbe4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:41 +02:00
yuexiao-wang
d4288a3212 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 0483d77613)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:34 +02:00
Sebastiaan van Stijn
cdda81146b Update API docs for "HostConfig.Binds" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 708892c403)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:27 +02:00
Steven Erenst
ddc58225f3 Fix regex for the json-file logger opts in overview.md 
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.

The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.

Signed-off-by: Steven Erenst <stevenerenst@gmail.com>
(cherry picked from commit e9a9015e38)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:21 +02:00
Sebastiaan van Stijn
22a3332325 Cleanup / sync RHEL, CentOS, Fedora installation docs 
These installation procedures are very similar, so
synchronized these docs and removed some differences.

Also;

- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
  installation, because most people want to have docker
  started automatically (and overlooked this step).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b2bb4e11aa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:14 +02:00
Alex Olshansky
7df1b6a962 Fix typos in installation doc for Mac 
Signed-off-by: Alex Olshansky <i@creagenics.com>
(cherry picked from commit f7af5cc780)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:06 +02:00
Sebastiaan van Stijn
7da3e5d0b2 Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 533b00da8b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:59 +02:00
Sebastiaan van Stijn
03a4e9a397 Update sshd example to use ubuntu 16.04 
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b81d12e7a1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:26:52 +02:00