0bb4c902e0
Merge pull request #22396 from sbellem/docs-typo-fix
...
Fix typo
2016-04-28 15:27:28 +02:00
63aa03ce0a
Fix typo
...
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
2016-04-28 15:15:08 +02:00
feb8f0e10e
Merge pull request #22391 from thaJeztah/update-changelog-in-master
...
merge changelog for v1.11.1 into master
2016-04-28 09:11:25 -04:00
a9935d276e
convert docs Dockerfiles to use docs/base:oss
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-28 12:57:13 +00:00
d37e22b623
Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence
...
docs: remove duplicate line in "Understand the architecture"
2016-04-28 12:45:08 +02:00
09021d6841
Merge pull request #22344 from cpuguy83/seccomp_for_centos
...
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
2016-04-28 12:26:22 +02:00
ca0c1becea
Add changelog for v1.11.1
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 4146b8b69b4fcc5a6ddbbac63f316695c2dbbb8f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-28 12:15:17 +02:00
bf7307558e
Merge pull request #22269 from coolljt0725/skip
...
Skip TestBuildNotVerboseFailure if no network
2016-04-28 11:19:56 +02:00
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
78eb8a5fb9
Merge pull request #21641 from yongtang/21595-discrepancy-on-hostname-validation
...
API/CLI discrepancy on hostname validation (#21595 ).
2016-04-28 09:25:13 +02:00
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
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
deb6ea4702
Merge pull request #22362 from ZJU-SEL/update-doc
...
update cgroup link in doc of run
2016-04-28 00:48:47 +02:00
1158c921ab
Merge pull request #22361 from duglin/removeCR
...
Remain extra \n on INFO log msg
2016-04-27 12:05:10 -07:00
01a34e43b3
Consolidate the files in client/
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 14:53:36 -04:00
30e3620eae
Refactor cliconfig so that the default constructor can exist in the package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 14:25:47 -04:00
33c9edaf6c
Cleanup the structure of the cli package.
...
Move all flags into cli/flags
Move usage help into cli/usage.go
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 14:25:47 -04:00
861815a325
Merge pull request #22229 from riyazdf/notary-doc-update
...
Update DCT docs with 1.11 info, fix typos
2016-04-27 09:59:30 -07:00
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
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
b9135646d6
Update the binary name in docker-engine-selinux/docker.fc.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 11:41:21 -04:00
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
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
d6176bb03a
Merge pull request #22137 from HackToday/addevents
...
Add load/save image event support
2016-04-27 12:58:49 +02:00
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
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
0147164cfd
Merge pull request #22329 from runcom/fix-tmpfs-order
...
daemon: reorder mounts before setting them
2016-04-26 20:23:13 -04:00
2b97201e0c
Merge pull request #22181 from Microsoft/jjh/workdir
...
Windows: Consistent build workdir handling
2016-04-26 16:51:09 -07:00
a8c5ba7517
Merge pull request #21384 from Microsoft/10662-IOResourceControls
...
Add IO Resource Controls for Windows
2016-04-26 15:54:52 -07:00
0433801093
Windows: Consistent build workdir handling
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 15:32:52 -07:00
57aef3b490
Windows: Support running dockerd as a service
...
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-26 14:04:47 -07:00
4925fcbe2e
Merge pull request #22324 from WeiZhang555/fix-test-case
...
Fix test case
2016-04-26 15:01:02 -04:00
d3d591c536
Merge pull request #22276 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
1f72e46095
Merge pull request #22291 from thaJeztah/update-template-for-changelog
...
pull-request template: ask for changelog description
2016-04-26 18:51:31 +02:00
0c7eab3157
Make dockerd debuggable
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
dc7664d62e
Merge pull request #22308 from tianon/dockerd-consistency
...
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00
f1ad6f127b
Exclude .git directories from the source RPMS
...
Ignore .git directory when creating debian sources
Added missing DOCKER_GITCOMMIT env variable to build-deb
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-26 09:26:32 -04:00
a7eecd2b61
Fix test case
...
"TestRestartContainerwithRestartPolicy" contains some codes that could be
flaky, it's supposed to be fixed in #22256 .
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
6b91fd1a91
Merge pull request #22328 from HackToday/fixcomment
...
Fix wrong comment
2016-04-26 13:00:38 +02:00
3f7b6754ca
Merge pull request #22331 from SvenDowideit/minor-api-formating-change
...
Small API formating fix.
2016-04-26 12:46:25 +02:00
204a52c689
Small API formating fix.
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-26 10:29:31 +00:00
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
6a8ea46c67
daemon: reorder mounts before setting them
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-04-26 11:03:25 +02:00
718eba8836
Fix wrong comment
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-26 07:36:14 +00:00
dc98cb534e
Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm
...
Windows: revendor Azure/go-ansiterm
2016-04-26 08:19:47 +02:00
78895c92c2
Merge pull request #22275 from Microsoft/jstarks/no_rsrc
...
Windows: Add file version information
2016-04-25 20:53:19 -07:00
e2c40555f7
Merge pull request #22318 from mrunalp/mount_label_fix
...
Fix mount label
2016-04-25 19:54:32 -04:00
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
66ebc34235
Merge pull request #22055 from Microsoft/sjw/servicing
...
Adding servicing update to postRunProcessing for Windows containers.
2016-04-25 15:20:23 -07:00
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
Sylvain Bellemare
Brian Goff
Sven Dowideit
Antonio Murdaca
Kenfe-Mickael Laventure
fy2462
Vincent Demeester
Zhuoyun Wei
Lei Jitang
Alexander Morozov
Daniel Nephin
moxiegirl
Riyaz Faizullabhoy
Michael Holzheu
Hao Zhang
Doug Davis
Kai Qiang Wu(Kennan)
Michael Crosby
John Howard
John Howard
John Starks
Ken Cochrane
Zhang Wei
Sebastiaan van Stijn
Antonio Murdaca
Mrunal Patel