Commit Graph

21517 Commits

Author SHA1 Message Date
3b37cd85fb Merge pull request #21212 from runcom/wip-token-service-tests
distribution: errors: do not access the errors slice if it's empty
Upstream-commit: f2b1b44de81ec9c7fd404fb3e0b4eefd83939a94
Component: engine
2016-03-16 13:44:18 -07:00
be817e6143 Merge pull request #21112 from allencloud/validate-configs-from-file
add validating configs from configuration file
Upstream-commit: f81754811fda48524133cc57ba8dac7aaf31274c
Component: engine
2016-03-16 10:42:25 -07:00
975b6f56a8 Merge pull request #21242 from cyphar/fix-userns-permissions
daemon: use 0711 for /var/lib/docker
Upstream-commit: 45b2a57d1c36d6f0140c0dea8769d58d04a9fc67
Component: engine
2016-03-16 08:49:17 -07:00
33247bc8f9 Merge pull request #21217 from LK4D4/cleanup_gitignore
gitignore: cleanup some not needed entries
Upstream-commit: eff27d2b77a2cd42122b53db9a6906f419cfc7ed
Component: engine
2016-03-16 08:24:31 -07:00
7167a81e8a Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write
Windows: fix various npipe bugs
Upstream-commit: 3221c7a3c6367c3223c0e1b82b3de7adbbca8651
Component: engine
2016-03-16 08:23:39 -07:00
c8e18de26f bash completion for gelf-compression log driver settings
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 854ceaaa9ee5aa4c9f0b824ed3a0536decf29ef1
Component: engine
2016-03-16 15:58:58 +01:00
7a50c5f3c8 Merge pull request #21250 from runcom/comment-fix
registry: endpoint_v1: fix outdated comment
Upstream-commit: 5f8a0ceeda003df141ab462a8ad20dad4f5b5fe4
Component: engine
2016-03-16 14:35:14 +01:00
a5bcba2abf Merge pull request #21203 from HackToday/fixfilter
Add check about filter name for containers
Upstream-commit: bd97e4f95a72b26b59bf42c74f6b221bebbd685c
Component: engine
2016-03-16 14:30:04 +01:00
4073a69824 registry: endpoint_v1: fix outdated comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 137c8601a8c744d464855755ce756f07e83aa0b7
Component: engine
2016-03-16 12:53:11 +01:00
8930418a24 daemon: use 0711 for /var/lib/docker
This fixes problems encountered when running with a remapped root (the
syscalls related to the metadata directory will fail under user
namespaces). Using 0711 rather than 0701 (which solved the problem
previously) fixes the issue.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: e91ca0e239f1e6c71a5a6c789ec8177806773355
Component: engine
2016-03-16 19:24:03 +11:00
f9e5200e21 distribution: errors: do not access the errors slice if it's empty
- cherry-pick from 1.10.3 branch: 0186f4d4223a094a050d06f456355da3ae431468
- add token service test suite
- add integration test (missing in 1.10.3 branch)

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1b5c2e1d722757a55364fb45cf3fcec7f2c75fb4
Component: engine
2016-03-16 09:00:39 +01:00
9042585b0d Merge pull request #21222 from aaronlehmann/pull-with-no-layers
Fix pulling images that contain no layers at all
Upstream-commit: 2b1b235acf9aa029218e1bd5cd97a369c500e4f5
Component: engine
2016-03-15 23:03:42 -07:00
23972297db Merge pull request #21233 from aaronlehmann/testtransfer-flakiness
Fix flaky test TestTransfer
Upstream-commit: aa76ddd35307a007b14e955f7d7d787cb13bc0ea
Component: engine
2016-03-15 20:59:56 -07:00
75cce52537 Add check about filter name for containers
Fixes: #21202
We add valid check about filters like network, images,
volumes did.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 8a90e8a19b8108ecdff325fc19dbdf945aa15fad
Component: engine
2016-03-16 03:53:40 +00:00
79f5e01124 Windows: add support for CloseWrite() to npipe transport
This relies on changes to go-winio to support CloseWrite() when the pipe
is in message mode. This fixes an issue where stdin is not properly closed
when there is no more input to docker run.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 59573fb3c6e8e55278c973b9c799db6ed9c0f9c7
Component: engine
2016-03-15 18:25:35 -07:00
be26fc7c6f Windows: revendor go-winio with npipe fixes
This revendor provides support for CloseWrite() in the npipe transport,
fixes a performance regression introduced in Go 1.6, and improves
npipe performance by allowing the pipe buffer size to be specified.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 87c2aad6f11c4993222dd29fb8c7c520b19ac8d9
Component: engine
2016-03-15 18:25:34 -07:00
9be1d1ff78 Merge pull request #21108 from tianon/detect-daemon-osarch
Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
Upstream-commit: 133b3cccb50dadf2b8b10519e3c8d8b924a91b76
Component: engine
2016-03-15 17:00:55 -07:00
333d5496a5 Merge pull request #20947 from thaJeztah/fix-pull-examples
Fix Docker pull examples
Upstream-commit: 354f9a8fd11f36c2c9a779a366e7779678e25a2f
Component: engine
2016-03-16 00:42:38 +01:00
bc34a5536f Merge pull request #21221 from tiborvass/changelog-1.10.3
Changelog from 1.10.3 to master
Upstream-commit: 08603dad63c068759eb7cd6a01e5331d1212ef9d
Component: engine
2016-03-15 16:37:47 -07:00
5953ce529c Update Docker pull examples
The old examples no longer worked due to changes in
the client and Docker Hub.

This updates the "docker pull" documentation and
adds more examples and explanation of the features.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 32eff909b4d3072524041fffc9d43efe87d2116f
Component: engine
2016-03-16 00:35:58 +01:00
5a76e4397a Fix flaky test TestTransfer
This test was checking that it received every progress update that was
produced. But delivery of these intermediate progress updates is not
guaranteed. A new update can overwrite the previous one if the previous
one hasn't been sent to the channel yet.

The call to t.Fatalf exited the current goroutine which was consuming
the channel, which caused a deadlock and eventual test timeout rather
than a proper failure message.

Failure seen here:
https://jenkins.dockerproject.org/job/Docker-PRs-experimental/16400/console

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2f4aa9658408ac72a598363c6e22eadf93dbb8a7
Component: engine
2016-03-15 16:26:16 -07:00
7cd02ebb1a Merge pull request #21022 from hqhq/hq_fix_race_resize
Fix race condition with exec and resize
Upstream-commit: cc12d2bfaae135e63b1f962ad80e6943dd995337
Component: engine
2016-03-15 22:54:55 +01:00
f29a1e7874 Merge pull request #21128 from allencloud/handle-kernel-and-os-error-in-info-api
handle kernel and os info error in /info api
Upstream-commit: db182507c1153b0ed3b0d30d4f41ab4ad8050882
Component: engine
2016-03-15 14:42:57 -07:00
03bd4af0a6 Merge pull request #21117 from justincormack/restart_syscall
Allow restart_syscall in default seccomp profile
Upstream-commit: 4adf74ad4290a6cf72426cabc3b0d8f3753615e6
Component: engine
2016-03-15 22:41:14 +01:00
9d058ac04d Merge pull request #21193 from amitkris/flush_fix
Remove flush(stdout) in pkg/chrootarchive/diff_unix.go
Upstream-commit: 6852d876593322a7b87caf5846e488984e77e7c0
Component: engine
2016-03-15 22:40:37 +01:00
a3b8590b37 Merge pull request #21110 from hypriot/fix-arm-kernel-modules
Improve checking dummy kernel module
Upstream-commit: bb23b20ee7e963614c913dab25f67fedfd029a24
Component: engine
2016-03-15 14:39:45 -07:00
1631c5a879 Merge pull request #21218 from runcom/len-check-fix
daemon: update: check len inside public function
Upstream-commit: a2039f117cd6f1969312894edcfd2652cf7f3995
Component: engine
2016-03-15 14:37:19 -07:00
a516bc2aa3 Merge pull request #19831 from cloudflare/optimize-gelf
GELF logger: Add gelf-compression-type and gelf-compression-level
Upstream-commit: 0f59b0b12c37b5a3b4ad1c8a0cb91c93ff4228a9
Component: engine
2016-03-15 22:35:46 +01:00
4a5c3e02cf Merge pull request #21226 from calavera/fix_experimental_deb_builds
Move debian rules to the right place before creating the package.
Upstream-commit: 6c2f4381d30780f27f7a6abe9fc344cbbf68e179
Component: engine
2016-03-15 13:37:20 -07:00
2c866ad3a3 Move debian rules to the right place before creating the package.
debhelper has changed the way it performs path validations and
building the deb package fails when it tries to compress the files.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 027f4fdca678ae955db6f115d6af15d532f6cf4b
Component: engine
2016-03-15 16:17:38 -04:00
66aada1792 Fix pulling images that contain no layers at all
The download manager assumed there was at least one layer involved in
all images. This can be false if the image is essentially a copy of
`scratch`.

Fix a nil pointer dereference that happened in this case. Add
integration tests that involve schema1 and schema2 manifests.

Fixes #21213

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7cf894ce1013e5843d5c151f24520b51d34515d0
Component: engine
2016-03-15 11:10:03 -07:00
f1b1331230 Update CHANGELOG with reverts
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 320d17b2a2b42a71089b7109797dc4c0f6a06fa8)
Upstream-commit: b5725434c6b01f5e25841d0d5165fd5b68187dca
Component: engine
2016-03-15 14:02:49 -04:00
af3951dd40 distribution: registry: do not access the errors slice if it's empty
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 0186f4d4223a094a050d06f456355da3ae431468)
Upstream-commit: 1f4e87f6384cf8a7c956cdb3f4bb37b0bf4a7095
Component: engine
2016-03-15 14:02:48 -04:00
31d3faf95d Update CHANGELOG for 1.10.3
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit f33460253887ec05b804cfa9f1daee8d1fd229e1)
Upstream-commit: 1c64becab64b1c665887cf45fbdb6fb4dce8c77c
Component: engine
2016-03-15 14:01:57 -04:00
6f209e48d5 Remove flush(stdout) in pkg/chrootarchive/diff_unix.go and improve error reporting of flush() to fix #21103
pkg/chrootarchive/diff_unix.go erroneously calls flush on stdout, which tries to read from stdout returning an error.
This has been fixed by removing the call and by modifying flush to return errors and checking for these errors on calls to flush.

Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: a9c61691389ed373ada399d25f55a9d10405b4ea
Component: engine
2016-03-15 10:29:51 -07:00
8a5b6da14b Merge pull request #21162 from estesp/copyastar-dir-create
Fix CopyWithTar creation of new destination dir as remapped root
Upstream-commit: 6f2d8b411eaaa6b4ea2a46e5164325450259573b
Component: engine
2016-03-15 10:26:30 -07:00
6decd866d9 daemon: update: check len inside public function
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: bb05c188927cdc7a5f86dceace3a4043b0dfeb28
Component: engine
2016-03-15 17:24:25 +01:00
27cea9b936 Merge pull request #21191 from tophj-ibm/ppc64le-update-dockerfile
ppc64le: update dockerfile hashes and notary
Upstream-commit: 69f297bfeef33145c4c23b5e555f39aa443cd60f
Component: engine
2016-03-15 09:17:45 -07:00
d2b8afab2b add validating configs from configuration file
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 825b58220705ed2870d89233a6f75c680b691476
Component: engine
2016-03-16 00:05:52 +08:00
6b75bb519f Merge pull request #20177 from jheiss/12076-net_hostname
Allow --hostname with --net=host
Upstream-commit: 21e531014db65422e1a3000fd3596459f55870c4
Component: engine
2016-03-15 08:17:25 -07:00
25ba01dd6e gitignore: cleanup some not needed entries
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 29fbc9cc1d67759974ec4cb746840ae160d842bc
Component: engine
2016-03-15 07:33:05 -07:00
e310757018 handle kernel and os info error in /info api
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b0fb0f19934287f428d14d1267183fe9194a4fdf
Component: engine
2016-03-15 20:23:15 +08:00
2f4ce11dc1 Merge pull request #21196 from LK4D4/detect_leaks_util
integration-cli: move goroutines info helpers to separate funcs
Upstream-commit: daabb45d0ac6c332ef0b54c30f70dfa2b459d362
Component: engine
2016-03-15 12:42:47 +01:00
9b54541f07 add gelf option to customize compression type and level
this allows user to choose the compression type (i.e. gzip/zlib/none) using
--log-opt=gelf-compression-type=none or the compression level (-1..9) using
--log-opt=gelf-compression-level=0 for gelf driver.

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
Upstream-commit: bd94baa353498df2457b3d5aa192cc488b9fa0c6
Component: engine
2016-03-15 11:06:06 +00:00
a9e5db306d Merge pull request #21205 from geekylucas/21195-update-docs-debian-image-size
Update docs: A more accurate size for debian image
Upstream-commit: 43b5e1ed40ded2d59f8505df254d2f95fbdf8132
Component: engine
2016-03-15 11:18:27 +01:00
45ead964ff Merge pull request #21190 from runcom/cleanup
*: remove unused stuff
Upstream-commit: 68ca76320fe1ca56d6b9dfed6ca84741f957a495
Component: engine
2016-03-15 11:13:10 +01:00
fd384bf5db Merge pull request #21209 from HackToday/fixdocps
Add the missed volume filter
Upstream-commit: f9fe796eabd015cbf861df2550a8bffd861a5b25
Component: engine
2016-03-15 10:59:52 +01:00
bff930c257 Add the missed volume filter
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: b1619766c0131a02774c7ec2b158c2fdf7206d05
Component: engine
2016-03-15 09:26:41 +00:00
2093c7b7f9 Update docs: A more accurate size for debian image
Fixes: #21195

The current size of the debian image is 125.1 MB so I have updated the Markdown to say "under 150". Also removed "extremely" (minimal) as requested.  Documentation built and tested using `make docs`.

Signed-off-by: Lucas Chan <lucas-github@lucaschan.com>
Upstream-commit: 2f634e4691d13616cf8c714ec7653616ec3b121a
Component: engine
2016-03-15 18:29:06 +11:00
fa85755ee7 Merge pull request #21097 from thaJeztah/dont-run-without-udev-sync
Fail when devicemapper doesn't support udev-sync
Upstream-commit: 37a1fadae6390e38da85d3fffe7a49e00de2830e
Component: engine
2016-03-14 21:18:01 -04:00