1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

23943 commits

Author SHA1 Message Date
Sebastiaan van Stijn
23e418b6c9
Add "driver" filter for network ls
This add a new filter to 'docker network ls'
to allow filtering by driver-name.

Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-29 16:22:26 +02:00
Doug Davis
24a8de2b60 Merge pull request from michael-holzheu/s390x-add-libseccomp-2.3.0
Dockerfile.s390x: Add upstream libseccomp to compile runc
2016-04-29 08:13:13 -04:00
Brian Goff
717842fbde Merge pull request from mlaventure/fix-experimental-builder
Allow specifying the apt mirror to use when generating deb packages
2016-04-28 16:26:29 -04:00
Kenfe-Mickael Laventure
d0a65a03e9 Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-28 13:05:34 -07:00
Brian Goff
ca611fdea2 Merge pull request from fy2462/exec-add-newline
Fix bug: exec non-exist command miss a "\n"
2016-04-28 11:30:28 -04:00
Brian Goff
dbee44c9e0 Merge pull request from wzyboy/support-unixgram-syslog-address
Support unixgram syslog address
2016-04-28 11:06:17 -04:00
Sebastiaan van Stijn
0bb4c902e0 Merge pull request from sbellem/docs-typo-fix
Fix typo
2016-04-28 15:27:28 +02:00
Sylvain Bellemare
63aa03ce0a Fix typo
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
2016-04-28 15:15:08 +02:00
Brian Goff
feb8f0e10e Merge pull request from thaJeztah/update-changelog-in-master
merge changelog for v1.11.1 into master
2016-04-28 09:11:25 -04:00
Sebastiaan van Stijn
d37e22b623 Merge pull request from thaJeztah/docs-remove-duplicate-sentence
docs: remove duplicate line in "Understand the architecture"
2016-04-28 12:45:08 +02:00
Antonio Murdaca
09021d6841 Merge pull request from cpuguy83/seccomp_for_centos
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
2016-04-28 12:26:22 +02:00
Kenfe-Mickael Laventure
ca0c1becea
Add changelog for v1.11.1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 4146b8b69b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-28 12:15:17 +02:00
Sebastiaan van Stijn
bf7307558e Merge pull request from coolljt0725/skip
Skip TestBuildNotVerboseFailure if no network
2016-04-28 11:19:56 +02:00
fy2462
8bf5613c1a Fix bug: exec non-exist command miss a "\n"
When exec a non-exist command, it should print a newline at last.

Currently:
```
$ docker exec -ti f5f703ea2c0a144 bash
rpc error: code = 2 desc = "oci runtime error: exec failed: exec:
\"bash\": executable file not found in $PATH"$
```

Signed-off-by: Feng Yan <fy2462@gmail.com>
2016-04-28 16:39:00 +08:00
Vincent Demeester
78eb8a5fb9 Merge pull request from yongtang/21595-discrepancy-on-hostname-validation
API/CLI discrepancy on hostname validation ().
2016-04-28 09:25:13 +02:00
Zhuoyun Wei
57fad95e43
Support unixgram syslog address
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs

Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
2016-04-28 11:04:50 +08:00
Lei Jitang
9ab0aa4336 Skip TestBuildNotVerboseFailure if no network
TestBuildNotVerboseFailure use a non-exist image busybox1,
it requires network connection to access to Dockerhub, skip
this test if there is no network.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-04-27 21:29:05 -04:00
Sebastiaan van Stijn
deb6ea4702 Merge pull request from ZJU-SEL/update-doc
update cgroup link in doc of run
2016-04-28 00:48:47 +02:00
Alexander Morozov
1158c921ab Merge pull request from duglin/removeCR
Remain extra \n on INFO log msg
2016-04-27 12:05:10 -07:00
moxiegirl
861815a325 Merge pull request from riyazdf/notary-doc-update
Update DCT docs with 1.11 info, fix typos
2016-04-27 09:59:30 -07:00
Riyaz Faizullabhoy
77da3bcb72 Update DCT docs with 1.11 info, fix typos
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-27 09:57:54 -07:00
Michael Holzheu
97f45bd629 Dockerfile.s390x: Add upstream libseccomp to compile runc
The runc compile currently fails on s390x:

 Step 35 : RUN set -x    && export GOPATH="$(mktemp -d)" && git clone
 https://github.com/opencontainers/runc.git
 "$GOPATH/src/github.com/opencontainers/runc"       && cd
 "$GOPATH/src/github.com/opencontainers/runc"      && git checkout -q
 "$RUNC_COMMIT"  && make static BUILDTAGS="seccomp apparmor selinux"     &&
 cp runc /usr/local/bin/docker-runc

 [snip]

 # github.com/seccomp/libseccomp-golang
 Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go:25:22:
 fatal error: seccomp.h: No such file or directory
  // #include <seccomp.h>

The problem is that the installed libseccomp version in trusty is too old.

Fix this and install version 2.3.0 of libseccomp like it is done in the
x86 Dockerfile.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-04-27 18:57:15 +02:00
Hao Zhang
8fec7c26d4 update cgroup link in doc of run
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
2016-04-27 08:50:46 -04:00
Doug Davis
1e44bba4af Remain extra \n on INFO log msg
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-04-27 05:19:40 -07:00
Vincent Demeester
d6176bb03a Merge pull request from HackToday/addevents
Add load/save image event support
2016-04-27 12:58:49 +02:00
Kai Qiang Wu(Kennan)
0656105710 Add load/save image event support
For every docker load and save operations, it would log related
image events.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-27 01:11:03 +00:00
Brian Goff
1521a41fc5 centos:7/OL:7 now includes libseccomp 2.2.1
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 20:48:26 -04:00
Brian Goff
0147164cfd Merge pull request from runcom/fix-tmpfs-order
daemon: reorder mounts before setting them
2016-04-26 20:23:13 -04:00
Michael Crosby
2b97201e0c Merge pull request from Microsoft/jjh/workdir
Windows: Consistent build workdir handling
2016-04-26 16:51:09 -07:00
John Howard
a8c5ba7517 Merge pull request from Microsoft/10662-IOResourceControls
Add IO Resource Controls for Windows
2016-04-26 15:54:52 -07:00
John Howard
0433801093 Windows: Consistent build workdir handling
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 15:32:52 -07:00
Brian Goff
4925fcbe2e Merge pull request from WeiZhang555/fix-test-case
Fix test case
2016-04-26 15:01:02 -04:00
Alexander Morozov
d3d591c536 Merge pull request from Microsoft/jjh/dockerd
Move docker and dockerd main packages in directories with same name, under `cmd/`
2016-04-26 11:24:01 -07:00
Sebastiaan van Stijn
1f72e46095 Merge pull request from thaJeztah/update-template-for-changelog
pull-request template: ask for changelog description
2016-04-26 18:51:31 +02:00
John Howard
0c7eab3157 Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
Vincent Demeester
dc7664d62e Merge pull request from tianon/dockerd-consistency
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00
Zhang Wei
a7eecd2b61 Fix test case
"TestRestartContainerwithRestartPolicy" contains some codes that could be
flaky, it's supposed to be fixed in .

This commit removes unnecessary code, make the test case cleaner.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-26 19:22:48 +08:00
Vincent Demeester
6b91fd1a91 Merge pull request from HackToday/fixcomment
Fix wrong comment
2016-04-26 13:00:38 +02:00
Sebastiaan van Stijn
3f7b6754ca Merge pull request from SvenDowideit/minor-api-formating-change
Small API formating fix.
2016-04-26 12:46:25 +02:00
Sven Dowideit
204a52c689 Small API formating fix.
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-26 10:29:31 +00:00
Sebastiaan van Stijn
eb59238d17
pull-request template: ask for changelog description
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-26 12:26:14 +02:00
Antonio Murdaca
6a8ea46c67 daemon: reorder mounts before setting them
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-04-26 11:03:25 +02:00
Kai Qiang Wu(Kennan)
718eba8836 Fix wrong comment
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-26 07:36:14 +00:00
Vincent Demeester
dc98cb534e Merge pull request from Microsoft/jstarks/revendor_ansiterm
Windows: revendor Azure/go-ansiterm
2016-04-26 08:19:47 +02:00
John Howard
78895c92c2 Merge pull request from Microsoft/jstarks/no_rsrc
Windows: Add file version information
2016-04-25 20:53:19 -07:00
Brian Goff
e2c40555f7 Merge pull request from mrunalp/mount_label_fix
Fix mount label
2016-04-25 19:54:32 -04:00
John Starks
fab67ab677 Windows: revendor Azure/go-ansiterm
go-ansiterm was previously pulling the testing package into the docker
binaries.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-25 15:57:59 -07:00
John Howard
66ebc34235 Merge pull request from Microsoft/sjw/servicing
Adding servicing update to postRunProcessing for Windows containers.
2016-04-25 15:20:23 -07:00
Mrunal Patel
e0f98c698b Update runc and spec dependencies for mount label
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-25 14:26:49 -07:00
Sebastiaan van Stijn
00e84ca4d2
docs: remove duplicate line in "Understand the architecture"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-25 23:16:49 +02:00