Commit Graph

24498 Commits

Author SHA1 Message Date
2d116f099f Vendor engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e
This fix updates engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e.

This fix is related to #23090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1dab9af5d5acc1fe3a1bfb84a5cc576d664095e4
Component: engine
2016-06-01 09:44:25 -07:00
499b99fb58 Merge pull request #22570 from mountkin/rm-deprecated-feature
remove deprecated feature of passing HostConfig at API container start
Upstream-commit: 4b86651053d92429ee2a73abd2d815a5d4c936a1
Component: engine
2016-06-01 18:24:28 +02:00
357ff8123d Merge pull request #23085 from icecrime/gitdm.config
Add gitdm configuration
Upstream-commit: 09be7d9ee4533c0b60c0c2b70d0cde41a86e5049
Component: engine
2016-06-01 18:12:59 +02:00
5934bb4c2f Merge pull request #23165 from thaJeztah/update-logging-code-hints
cleanup logging driver documentation
Upstream-commit: 8d75709f90ba9926d41cd7b91bb316e336af8f8c
Component: engine
2016-06-01 17:55:24 +02:00
e66ae89f7b Merge pull request #23142 from Microsoft/ExtraCleanup
Windows: Remove a double free on hcs container handle
Upstream-commit: bcf0c8ca2883867ba7dcec4824a64359ee7cab12
Component: engine
2016-06-01 11:09:06 -04:00
f05fdb403b Merge pull request #23084 from estesp/ps-fastpath
Optimize `docker ps` when name/id filters in use
Upstream-commit: 466eb1bab702f7afd652e57f6041124d5399fbd4
Component: engine
2016-06-01 16:52:35 +02:00
67d0b2dc23 remove deprecated feature of passing HostConfig at API container start
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 0a8386c8be3fa87b7523bef7fd31c81a7f84709c
Component: engine
2016-06-01 22:25:17 +08:00
9c661aedc4 Merge pull request #22989 from Microsoft/StartCleanup
Windows: Adding missing cleanup call when container start fails
Upstream-commit: c7aba69cc10faee84ba877ad4a94e4e150cb0932
Component: engine
2016-06-01 15:42:47 +02:00
ef3d1ff998 Merge pull request #23072 from dnephin/set_state_dir_of_containerd
Set --state-dir on containerd
Upstream-commit: 1ba9aadbcb8444e4dd70cd83f0d14d7f3c694f10
Component: engine
2016-06-01 14:56:32 +02:00
f27714bc80 Merge pull request #23133 from runcom/graphtests-fix
graphtest: fix cleanup logic
Upstream-commit: cdf61152bb58f6d10217434c1f976fcdea15110e
Component: engine
2016-06-01 08:42:19 -04:00
dd16c85f55 Merge pull request #23143 from bfirsh/remove-status-column-from-clinet-libraries-page
Remove status column from client libraries page
Upstream-commit: 74c7363965625848c32a5af80526fb65ecb26064
Component: engine
2016-06-01 13:45:28 +02:00
46e46eb95e cleanup logging driver documentation
This does a minor cleanup of the logging driver
documentation;

- Add a table-header to the driver-options
  table.
- Add language hints to code-blocks to
  prevent incorrect highlighting
- Wrap some code examples so that they
  fit in the default layout
- Wrap text to 80-chars
- Fix ordering in menu
- Some minor rewording

We should still create separate pages
for all available drivers (for example,
json-file, syslog, and GELF don't have
their own configuration page)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a9f6d93099283ee06681caae7fe29bd1b2dd4c77
Component: engine
2016-06-01 13:18:25 +02:00
62fbe9a76e Merge pull request #23145 from crosbymichael/clang
Use clang 3.5 over 3.8
Upstream-commit: 41232e4b360aca1e041aa7dbbe33af69efce6ca6
Component: engine
2016-05-31 19:18:02 -07:00
b2b61a70f2 Use clang 3.5 over 3.8
the llvm apt repo was removed and finding the exact rev of the llvm
toolchain that worked perfecting in our dockerfile is a problem.

We looked at the reasons why we were using this version of clang and it
appears to be this compiler warning.

`was built for newer OSX version (10.11) than being linked
(10.6)`

When you look at the dockerfile this makes sense.

```
ENV OSX_SDK MacOSX10.11.sdk
ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4
RUN set -x \
	&& export OSXCROSS_PATH="/osxcross" \
	&& git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \
	&& ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \
	&& curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \
	&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh
ENV PATH /osxcross/target/bin:$PATH
```

We are basically using the 10.11 sdk but linking to 10.6 as the
min version so this warning should be expected.

Also the docs on the osxcross project require clan 3.2+, not 3.8.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f8dacaf0ab7ca533cc3a33c6d06f7dca3e347955
Component: engine
2016-05-31 16:45:42 -07:00
33dcac83e5 Remove status column from client libraries page
They are all "active". If they are not active, we should probably
remove them.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 896fbb470a5fa118039ccbd30c3bffdcc6c461ff
Component: engine
2016-05-31 16:12:14 -07:00
898770c3b7 Update client libraries introduction text
Explain what they actually are.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 2fea5b6e28c6b92ee2e453ad1855d17246d6e08e
Component: engine
2016-05-31 16:11:36 -07:00
3d90736ff8 Merge pull request #23130 from justincormack/seccomperror
Error out if user tries to specify a custom seccomp profile on system that does not support it
Upstream-commit: 4a7715c9783627ecc194dac8502a684f40a9d0bd
Component: engine
2016-05-31 22:40:58 +02:00
b9c6d22ba9 Set --state-dir on containerd.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8b5e5c61955eba9af7c2975b959c4f4517485389
Component: engine
2016-05-31 11:48:05 -07:00
2360dea0b4 graphtest: fix cleanup logic
device Base should not exists on failure:

--- FAIL: TestDevmapperCreateBase (0.06s)
    graphtest_unix.go:122: stat
/tmp/docker-graphtest-079240530/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.00s)
    graphtest_unix.go:219: devmapper: device Base already
exists.

it should be:

--- FAIL: TestDevmapperCreateBase (0.25s)
	graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.13s)
	graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Snap/rootfs/a subdir:
no such file or directory

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: b18062122d76a9f53822889874aa12103d491372
Component: engine
2016-05-31 20:08:57 +02:00
1ed90a29aa Windows: Remove a double free on hcs container handle
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: c8454394f76865777d4cd013c606d17dcd0f9600
Component: engine
2016-05-31 10:25:38 -07:00
7a3282f5c8 Windows: Adding missing cleanup call when container start fails
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 054992e2913cf10171eecb5f41e5c19158cf04bc
Component: engine
2016-05-31 10:19:05 -07:00
86035f6061 Error out if user tries to specify a custom seccomp profile on system that does not support it
Fixes #23031

If a profile is explicitly passed but the system is not built with seccomp support,
error out rather than just running without a profile at all as we would previously.
Behaviour is unchanged if no profile is specified or unconfined is specified.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 6bd797b43fa738efc7eed02e96c21b352aa1c25b
Component: engine
2016-05-31 17:52:40 +01:00
5742c6afc6 Merge pull request #23046 from mountkin/fix-23045
fix flaky test TestImportFileWithMessage
Upstream-commit: 0b5e84cc8d190520e55a80530d29c455805974af
Component: engine
2016-05-31 09:39:38 -07:00
03c6411a70 Merge pull request #23108 from michael-holzheu/s390x-dockerfile-gcc-6.1
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
Upstream-commit: d1e9e86122ff4dc024dfccf53797b80f87a62cd4
Component: engine
2016-05-31 09:14:41 -07:00
19caa36bb6 Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
Pull request #22840 and commit 40b21745cc ("Upgrade to golang 1.6.2")
introduces gcc 6.1 for Dockerfile.gccgo and Dockerfile.ppc64le.
So do this also for s390x and use "s390x/gcc:6.1" as base image.

In addition to this use "GO15VENDOREXPERIMENT=0" for notary build
as a workaround for:

 * golang/go#15814
 * golang/go#15628

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: b5490d48979c3afa29d50dc8527aa6579cd1e634
Component: engine
2016-05-31 04:39:20 -04:00
1e94dac61d Merge pull request #23113 from AkihiroSuda/fixTIOCGWINSZ23112
Fix pkg/jsonmessage.TestProgress panic
Upstream-commit: ba372df79c410438cd39d7c7c2b02e4ebc76bc5f
Component: engine
2016-05-31 14:58:55 +08:00
f88f2ccec9 Merge pull request #23038 from AkihiroSuda/fixPkgDirectoryFilepathWalk
Fix filepath.Walk misusage in pkg/directory
Upstream-commit: a1f1e9c6d9b47a51e7ddc1c123ebd8b50605e230
Component: engine
2016-05-30 22:18:56 -07:00
04dff50af9 Fix pkg/jsonmessage.TestProgress panic
Fix #23112

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 709478c8a3bfaf935dcb37b4f4e0085832868eb7
Component: engine
2016-05-31 04:19:00 +00:00
1bb6a6a0db Optimize docker ps when name/id filters in use
When a partial ID or name is used in `docker ps` filters, today the
entire list of containers is walked even though there are shorter paths
to acquiring the subset of containers that match the ID or name. Also,
container's locks are used during this walk, causing increased lock
contention on a busy daemon.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 8e4a451448376932d57885541be22c9a38de5668
Component: engine
2016-05-30 17:43:55 -04:00
80c13c15f4 Merge pull request #23106 from LINBIT/master
Add the DRBD Docker Volume Plugin to the documentation
Upstream-commit: ef42e2f214dd528e3520d394d2d648de92f703cd
Component: engine
2016-05-30 18:21:26 +02:00
b6a3d1bab8 Add the DRBD Docker Volume Plugin to the documentation
Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com>
Upstream-commit: ef238db508f55f70b982a95bb37e79536fe75e4b
Component: engine
2016-05-30 17:46:53 +02:00
df33adb751 Merge pull request #22103 from coolljt0725/fix_22093
Fix docker create with duplicate volume failed to remove
Upstream-commit: edcc9577bf95c2eeaa15955e7b1c00a18cec7cb6
Component: engine
2016-05-30 15:57:13 +02:00
801ed1028f Merge pull request #22384 from yongtang/22358-log-tag-prefix
Remove `docker/` prefix from log messages tag.
Upstream-commit: f3a7abee8107eb13e13dfff959998286b87a34ed
Component: engine
2016-05-30 14:48:31 +02:00
cdf6273e0c Merge pull request #23091 from allencloud/print-network-name-when-rm
print network name when rm successfully
Upstream-commit: 34e0a01de2e5f070b4d9b7d83166c5cf8fe20300
Component: engine
2016-05-30 13:33:29 +02:00
84622fbef7 Fix filepath.Walk misusage in pkg/directory
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: cd53ec524410020db312089f2623b1a50f30121e
Component: engine
2016-05-30 07:40:46 +00:00
99c3df8fdb Merge pull request #23092 from albers/completion-dockerd
bash completion for dockerd
Upstream-commit: d305b0385c39319304b79cb020d770234c85e589
Component: engine
2016-05-29 18:23:33 +02:00
bb11d0c2a4 print network name when rm successfully
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 27ebd79222759762bec8a582f143408c7a32a969
Component: engine
2016-05-29 23:42:45 +08:00
9ca60cdcf4 bash completion for dockerd
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5f1c5b28a719d63005ce5e2190348bdfbce629c3
Component: engine
2016-05-29 07:09:05 -07:00
97b7f31e77 Merge pull request #23081 from ibuildthecloud/not-insane
Change insane to infallible
Upstream-commit: 6184518fe3c902b3a38758fed551501591229b05
Component: engine
2016-05-29 11:21:51 +02:00
cd8eab09a6 Merge pull request #23019 from vdemeester/more-daemon-horn-moving
Moving some more methods away from daemon.go
Upstream-commit: c0501025368544a64060da431a270d8f954b7e98
Component: engine
2016-05-28 22:07:31 -07:00
e49e05c1a7 Add gitdm configuration
Update .mailmap and add gitdm configuration.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bf6d52bba16072d0c0f85782a5907acad4067789
Component: engine
2016-05-28 21:08:20 -07:00
c93effc149 Change insane to infallible
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: cc5024225a37d8e804a9b797299f92084423091a
Component: engine
2016-05-28 09:49:34 -07:00
7fd135c93f Merge pull request #21895 from hypriot/add-raspbian-jessie-deb
Build deb package for all Raspberry Pi's / raspbian-jessie
Upstream-commit: 02caa73df411debed164f520a6a1304778f8b88c
Component: engine
2016-05-28 12:48:36 +02:00
1652ca95c9 Merge pull request #23054 from mountkin/test-comments
make the error message in TestRunSeccompDefaultProfile more precise
Upstream-commit: da39e9a4f920a15683dd0f23923c302d4db6eed5
Component: engine
2016-05-28 10:11:04 +02:00
819594b370 Merge pull request #23074 from jstarks/fix_windows_graph_name
Windows: fix Windows graph driver name
Upstream-commit: e0ee0ac7892ee7921c30b22df7a6ff4ae6b9d28c
Component: engine
2016-05-27 22:23:51 -04:00
e813bd3871 Merge pull request #23041 from AkihiroSuda/fixPkgDiscoveryKvTestTooShortSleep
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
Upstream-commit: 936945760314801b99b471227937fc5a302f72e7
Component: engine
2016-05-27 21:11:33 -04:00
6240c16449 make the error message in TestRunSeccompDefaultProfile more precise
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: f80bfdf85ca3463f59c93bf73c484f42c308fa8b
Component: engine
2016-05-28 09:06:25 +08:00
41b187c1d6 Merge pull request #23073 from justincormack/splitseccomptest
Split the Seccomp tests into two
Upstream-commit: 8a26b1dd61c232ed5d75e305dc9618c56350214c
Component: engine
2016-05-27 17:27:08 -07:00
cbb77a7aad Merge pull request #23061 from thaJeztah/remove-GO15VENDOREXPERIMENT
Remove GO15VENDOREXPERIMENT
Upstream-commit: 58b4164feb2ad75e6454012690be0eea9343261e
Component: engine
2016-05-27 16:54:19 -07:00
98b281fb61 Windows: fix Windows graph driver name
Reverting "Windows filter storage driver" to "windowsfilter".

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: f182748b9b7d639c4db09f4f72411aba5f811f4e
Component: engine
2016-05-27 16:24:02 -07:00