Commit Graph

1356 Commits

Author SHA1 Message Date
04d1de1324 Remove Fedora 22 from RPM build as it is EOL
Fedora 22 reached end of life on July 19th, and
will no longer receive updates;

https://fedoramagazine.org/fedora-22-end-of-life-2016-july/

With the recent release of Fedora 24, Fedora 22 will officially enter End Of
Life (EOL) status on July 19th, 2016. After July 19th, all packages in the
Fedora 22 repositories will no longer receive security, bugfix, or enhancement
updates, and no new packages will be added to the Fedora 22 collection.

Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended
for all users still running Fedora 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff405a1d2b9cb7ccbd315e882b6bd7560eb4159c
Component: engine
2016-10-16 21:13:26 -07:00
3cf3d53749 Update required modules for overlay dataplane encryption
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 275013ce8b769082b723c4eec0850b10e6dfb7be
Component: engine
2016-10-11 14:06:55 -07:00
2722bc3d62 Merge pull request #26565 from justincormack/pinata-bundle
Add a script to install a bundle into Docker for Mac
Upstream-commit: c98571b8f8a6e2140492e057a66c2b2b9741af33
Component: engine
2016-10-11 16:17:49 +02:00
5a907ff50f Merge pull request #26782 from cdrage/add-nat-check-to-script
Add check for CONFIG_IP_NF_NAT to kernel check
Upstream-commit: 45d346291463a594090b96b28d110539f2d66502
Component: engine
2016-10-11 15:14:53 +02:00
d0516ab406 Merge pull request #26970 from wzhliang/restart-stopped-container
zsh: allow restarting stopped containers by id
Upstream-commit: 6b997739fe5f4de411ccf30be574ee11a2780018
Component: engine
2016-10-11 14:37:54 +02:00
ccf5d6bcd1 Add zsh completion for 'dockerd --init-path'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 3db52223402145e3e83d478d827abf5cfa20e981
Component: engine
2016-10-06 07:38:39 +02:00
2e8039dc97 Merge pull request #25837 from reaperhulk/support-compressing-build-context
Add support for compressing build context during image build
Upstream-commit: f08a450ad35706900766e7766d30a90d688e410b
Component: engine
2016-10-05 12:57:46 -07:00
b1a0a5b72b Add a script to install a bundle into Docker for Mac
After building docker from the git repo, you can run
```
./contrib/mac-install-bundle.sh install
```
and this will tell Docker for Mac to look for a bundle at the current
path to run instead of the built in version of Docker. This will persist
until you do a factory reset or run
```
./contrib/mac-install-bundle.sh undo
```

A factory reset is advised to reset as a development Docker may break your
install.

The path must be a path that is shared with Docker for Mac so that the VM
can find it - nothing is installed into the image.

This is in `contrib/` as it is a best effort attempt to make it easier for
Docker for Mac users to test master or pull requests. If it breaks anything
a factory reset is your friend.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 6860c101ad4df6de30453ab39c4c26099f1fe137
Component: engine
2016-10-05 13:21:18 +02:00
fbb94af7cf Merge pull request #27042 from mlaventure/remove-ubuntu-wily
Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
Upstream-commit: d4b8bf49ddb43d148a07414920bbf6f46b56ba72
Component: engine
2016-10-05 12:19:05 +02:00
94417a16f4 Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
As of July 28, 2016, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html) and will receive no further updates.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: e9a81057086cf9834cce4c49c6f8ef035938fc64
Component: engine
2016-10-04 13:01:00 -07:00
0917756ee5 Add check for CONFIG_IP_NF_NAT to kernel check
This appears to be missing. NAT (via iptables) is required in order to
setup Docker networking.

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
Upstream-commit: 2fb2361b29aeaa0d0f931f55db372bc8f56b4c60
Component: engine
2016-10-04 12:14:45 -04:00
674e83fb8c Merge pull request #27085 from alexchenfeng/master
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT C…
Upstream-commit: ce64a9bffd8f0411bbd34f6ea690b7e129898b02
Component: engine
2016-10-03 14:23:07 -04:00
84ce717a7a Merge pull request #27097 from albers/completion-node-ps-multiple-nodes
Add support for multiple nodes in bash completion for `docker node ps`
Upstream-commit: 367d5b02322b8211c18b95faba1527ec591045f5
Component: engine
2016-10-02 14:38:46 +02:00
9f3299176f Add support for multiple nodes in bash completion for docker node ps
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9aeb69a0690d0d26bd3dea344f675b22f9ceda19
Component: engine
2016-10-02 05:18:32 -07:00
22e87ff2f2 Add bash completion for dockerd --init-path
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d710a3e1f8d1ffeeb141a08806e18623a36d2248
Component: engine
2016-10-02 05:10:00 -07:00
707bb1cca6 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>
Upstream-commit: 4c74469d30a71c53cc6b309a3c0048191b1ac008
Component: engine
2016-10-01 09:50:17 +08:00
02efb59787 Add support for compressing build context during image build
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."

Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com>
Upstream-commit: 4825e58a96188e6a9c739c31966c8ac5a2bbd1d7
Component: engine
2016-09-30 17:46:08 -05:00
48a609d72c Add a new "is-task" ps filter
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
2016-09-28 12:45:30 +02:00
83d24dff5e allow restarting stopped containers by id
Signed-off-by: Wenzhi Liang <wenzhi.liang@gmail.com>
Upstream-commit: 568aa9675c971cba4c9043a50a46ea89480bfea3
Component: engine
2016-09-28 11:27:11 +08:00
9c391e0cdf Fix bash completion for docker logs --since
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e2244352a79f5d23cf874d72b6abed9be2da9f8
Component: engine
2016-09-27 18:58:48 +02:00
0cc382f1ee Merge pull request #26920 from tophj-ibm/add-1404-make-debs
ppc64le: add files for supporting 14.04 'make debs'
Upstream-commit: 1dbf3c65e15a2d021cc15ded9caaf6192d58970b
Component: engine
2016-09-27 07:54:57 -07:00
8a1347213b Bump remaining Dockerfile go versions to 1.7.1
These weren't updated with the switch to go1.7.1

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: f431211631f0dd68ec41c970e5b951c5141e3f9b
Component: engine
2016-09-26 12:13:39 -04:00
649581b0c1 Merge pull request #26909 from sdurrheimer/zsh-completion-stats-format
Add zsh completion for 'docker stats --format'
Upstream-commit: 285a9d5e351e01df255ce9345bf83fa4180ecd14
Component: engine
2016-09-26 10:32:52 -04:00
3fec534730 ppc64le: add files for supporting 14.04 'make debs'
This PR adds the necessary files needed in order to make ubuntu 14.04
ppc64le docker debs

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 9a928e32325c399999342fcf24d9fd3074137a90
Component: engine
2016-09-26 10:24:55 -04:00
1ac60a1881 Add zsh completion for multi-nodes 'node ps'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d918fc8e08e4e8684c7074c310d491cd15412865
Component: engine
2016-09-26 09:16:16 +02:00
8612f6b746 Add zsh completion for 'docker stats --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7aa600dffbd3d5c615f74e93a1d9782c442c292d
Component: engine
2016-09-26 09:10:29 +02:00
7ccf7f0db3 Merge pull request #24290 from ownaginatious/armv6_arch
Changed ArchLinux image maker script to support ARMV versions other than 7
Upstream-commit: 219f88364c7e06f3a122089d5997800b9e2fd04d
Component: engine
2016-09-25 01:43:20 +02:00
69f06771c4 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
support docker node ps multiNodes
Upstream-commit: c03c80b1b03f3a061072af07d6d1fb811f29a9e3
Component: engine
2016-09-23 09:50:24 +02:00
fa0da9e5eb Merge pull request #26104 from michael-holzheu/PR-s390x-make-deb-ubuntu-xenial
s390x: Enable "make deb" for Ubuntu Xenial (16.04)
Upstream-commit: 24fbed9a916aa8a8ea8692a4ba5ce2956ebb2b37
Component: engine
2016-09-22 10:39:58 +02:00
4d0761852a Add bash completion for docker stats --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ed0f53d7b6c64044a02e65251e92e7cac7f41c14
Component: engine
2016-09-21 20:19:14 +02:00
8c9dacb458 Merge pull request #26270 from AkihiroSuda/fix-typo-docker-images
[nit] fix the man page and zsh completion for `docker images`
Upstream-commit: be9e3f59e625a7be05f21a23f6debfb3f6728573
Component: engine
2016-09-20 15:56:23 +02:00
14f9dd10a3 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
2016-09-19 17:30:27 +02:00
fc3c6766ab Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
Upstream-commit: efe4e914efe5f42a5b5e424ed519fda71343f7de
Component: engine
2016-09-16 10:22:09 -07:00
e6635a948e add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
2016-09-15 09:55:29 +00:00
69938656f3 Add errexit to mkimage-yum.sh
Add errexit to mkimage-yum bash script to abort early. This to prevent
disaster when mktemp fails and leave $target variable empty.

Signed-off-by: Carl Loa Odin <carlodin@gmail.com>
Upstream-commit: fa255c92df52f816ec15b60460f02c8e66534e76
Component: engine
2016-09-14 12:04:04 +02:00
5c9eaf9226 Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
Add zsh completion for 'service {create,update} --group-{add,rm}'
Upstream-commit: 0deae9f2fa3672bf7e5ce5899253e498800726b7
Component: engine
2016-09-13 10:18:27 +02:00
689d1a45e3 Add zsh completion for 'service {create,update} --group-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1df220d51fcba1e6f0a03bb83f80a7d45137f385
Component: engine
2016-09-13 10:15:22 +02:00
5099b8d2c1 Splunk Logging Driver performance improvements
New driver options:

- `splunk-gzip` - gzip compress all requests to Splunk HEC
(enabled by default)
- `splunk-gzip-level` - change compression level.

Messages are sent in batches by 1000, with frequency of 5 seconds.
Maximum buffer is 10,000 events. If HEC will not be available, Splunk
Logging Driver will keep retrying while it can hold messages in buffer.

Added unit tests for driver.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 4907cc7793cf469fc2d6fc0f842d08bd045da569
Component: engine
2016-09-12 09:00:16 -07:00
5f6c283538 s390x: Enable "make deb" for Ubuntu Xenial (16.04)
With this patch and Docker PR 25883 ("Add a Dockerfile for generating
manpages on s390x") "make deb" creates the following packages for s390x:

 # cd bundles/1.13.0-dev/build-deb/
 # find .
   .
   ./ubuntu-xenial
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.dsc
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.changes
   ./ubuntu-xenial/Dockerfile.build
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.tar.gz
   ./docker.log
   ./test.log

Package "docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb"
could be successfully installed on a s390x Ubuntu system:

 # cat /etc/issue
 Ubuntu 16.04.1 LTS \n \l
 # dpkg -i docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
 ...
 Installing new version of config file /etc/init.d/docker ...
 Installing new version of config file /etc/init/docker.conf ...
 Processing triggers for systemd (229-4ubuntu7) ...
 Processing triggers for ureadahead (0.100.0-19) ...
 Processing triggers for man-db (2.7.5-1) ...

 # docker version
 Client:
  Version:      1.13.0-dev
  API version:  1.25
  Go version:   go1.7
  Git commit:   2693af4-unsupported
  Built:        Wed Aug 24 11:41:13 2016
  OS/Arch:      linux/s390x

 Server:
 ...

The s390x "generate.sh" is a modified version of "ppc64le/generate.sh".
We removed seccomp for s390x because we need at least libseccomp version
2.3.1 which is not provided by Ubuntu Xenial.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 73df9b4e87d0a9fc13ef75e0d8f2f50ddfc8c7e5
Component: engine
2016-09-12 16:10:36 +02:00
0b4dde90a0 Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
69668dcc9a support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: af4461ad290d660acab5ef87b96e392263cc7cb9
Component: engine
2016-09-10 02:52:48 +08:00
640335fb90 Add completion for docker events -f event=health_status
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d5a79579d38476121ff5ee49e74bdfd0d80a3bb7
Component: engine
2016-09-06 13:46:21 -07:00
54fd9ae518 Add bash completion for service {create,update} --group-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: be455538aa452efa086df9e1a44045bab59c7a00
Component: engine
2016-09-04 05:52:50 -07:00
2f578bc37e fix the man page and zsh completion for docker images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: f3d9214d0b42788cfda5104e2a223e968e5a7e82
Component: engine
2016-09-02 09:52:10 +00:00
6b40fbbd4d Remove bash completion for docker volume create --name
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7f9096adb7f5aa3845e256323c7f2107c04d2ff2
Component: engine
2016-08-31 09:50:11 +02:00
cc7e4cafad Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
2016-08-30 17:05:32 -07:00
37e3bbaff0 make node ps default to self in swarm node
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
2016-08-30 17:34:16 +08:00
87d651a44b Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 85071bda33f5aa3aeee0f9feb371740b21f9c5f9
Component: engine
2016-08-28 12:40:10 +02:00
6d81343bdb Merge pull request #26008 from resin-os/fix-btrfs-check
check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
Upstream-commit: 95fca642a1cdb70f27c01a4595e12e9109bed0f7
Component: engine
2016-08-25 12:39:35 -04:00
a0d759f31d Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
Upstream-commit: 78771b62255456bef110a3e310eb20165e5ece9f
Component: engine
2016-08-25 09:12:31 -07:00