Commit Graph

216 Commits

Author SHA1 Message Date
503a6ed4ff update comment
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9b8d328666a6cd5313208cdf5f116825f06dccdc
Component: engine
2016-02-02 10:03:52 -08:00
ee8542db2e Include a new version of notary with less verbose INFO+ logging
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 71a1caddf0af51cfc79db04f80513b292adb0231
Component: engine
2016-01-27 09:46:26 -08:00
65cf98bf38 Re-vendor notary, as well as change jfrazelle/go to docker/go.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 8fd2c8791d9c7cf0dd28b77565f0a04349a8c9a2
Component: engine
2016-01-26 18:02:00 -08:00
4edafc3bc1 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
4e4ba6f308 Move long compilations before Go install in Dockerfile
Now we can avoid long compilations on Go update.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c38cba3b8c769d39a1e42e0b79fa2eeb77fd6f04
Component: engine
2016-01-19 22:43:42 -08:00
28d6652c84 Vendor updated docker/distribution package
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 588e27f9a57cc2e2cdd84f49cf8cb5a7caed467b
Component: engine
2016-01-19 13:28:51 -08:00
d3d0a35112 Merge pull request #19340 from Microsoft/jjh/rsrcfix
Windows: Remove linkmode internal hack
Upstream-commit: 790e648c0613e435be56727e1ebbdc0ccf8aeb56
Component: engine
2016-01-15 14:10:56 -08:00
170652aa2c Merge pull request #19345 from tianon/fast-syscall-compile
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
Upstream-commit: dd104eb91d6e2eeb92467363d75c762ec303ac84
Component: engine
2016-01-15 16:06:14 -05:00
6e02d0f3a0 Merge pull request #19355 from riyazdf/notary-revendor
notary revendor into docker
Upstream-commit: 4c89b1f72c1259858e243ddbfb00d74dbafeff8a
Component: engine
2016-01-15 01:02:35 -08:00
9952183b81 revendor notary and wrap friendlier error messages
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: dd7436c832a5dd777d0276c3e3b1819062b86ebc
Component: engine
2016-01-14 20:35:59 -08:00
c8a4568d47 Merge pull request #19109 from BrianBland/crossRepositoryPush
Cross repository push
Upstream-commit: 94b2d5669016be0063abbcb6917026bdfb52478c
Component: engine
2016-01-14 18:50:53 -05:00
bcd131a7aa Changes cross-repository blob mounting to a blob Create option
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
Upstream-commit: 63099477189ea14f3122f6aa37fa7c60d33562c7
Component: engine
2016-01-14 14:26:03 -08:00
2365ad5675 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886
Component: engine
2016-01-14 13:51:30 -08:00
f048e88551 Windows: Remove linkmode internal hack
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6ca5a2c476f548b55d68daa4264b4ef9e6c2696d
Component: engine
2016-01-14 13:09:28 -08:00
8735a147d2 Add note in dockerfile about go version
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6c1382e151676ada408d89d6e197dbcf47dc4ebd
Component: engine
2016-01-14 12:20:19 -08:00
7afe53c8eb Adds cross-repository blob pushing behavior
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.

Signed-off-by: Brian Bland <brian.bland@docker.com>
Upstream-commit: 7289c7218e2101eb94fb90f2cb22e1412d016984
Component: engine
2016-01-13 14:26:30 -08:00
2e1c787d5f Bump Go to version 1.5.3
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9560d941142b0bd17b0aa51e4d9bfe22354732ec
Component: engine
2016-01-13 17:23:46 -05:00
2ca875c002 Update docker-py commit to the latest HEAD.
To fix issues with IPAM options.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: db41c5f5a5fe78aaf851f1c652661ab32e77c788
Component: engine
2016-01-12 13:19:17 -05:00
46b5818462 Merge pull request #18785 from aaronlehmann/new-manifest
New image manifest format
Upstream-commit: f11b6a2ab313a03d051dd6f69d264d0482df72d6
Component: engine
2016-01-11 12:01:46 -08:00
5cfea6b0eb Merge pull request #19076 from tianon/multiarch
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
Upstream-commit: 2d5ca742eb54e077861a29f201eb8fa38359cb1b
Component: engine
2016-01-11 13:25:55 -05:00
4d0b394b25 Build a pre-schema2 registry to test schema1 push/pull
Add DockerSchema1RegistrySuite which uses this registry, and make
applicable integration tests run as part of this suite.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1fa2e3115105f6b2334f452bd08415e8f00633d7
Component: engine
2016-01-08 17:27:31 -08:00
03dfb7ff42 Re-vendoring notary in order to deal with a canonical JSON serialization issue.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
2016-01-08 16:45:15 -08:00
1ce594cbcd update tests and error messages, revendor notary with tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
2016-01-08 09:11:33 -08:00
f4511c75b9 Add an integration test for docker being able to push to a repo with delegations.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 1db0c7bb01863f859a193246a0474f9d1b4d6027
Component: engine
2016-01-07 19:35:45 -08:00
b741751f8d Notary delegation integration into docker
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
2016-01-07 19:35:45 -08:00
819eda8142 Refactor multi-arch support (especially for new mostly-official multi-arch official images)
See 99433d2ca2/README.md (architectures-other-than-amd64) for some context of where these images come from.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 91201678c6f58a5e46fe302bed9eb55a7ddcf693
Component: engine
2016-01-06 14:34:29 -08:00
b985b8195a cleanup jess/unshare image
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 626c933730cffb6ca9112271dc4df5a1e462cac1
Component: engine
2015-12-30 16:20:05 -08:00
6a60a41968 Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets
Also, fix up some minor whitespace consistency issues, remove a little cruft, and update GOARM for armhf to 7 so that we're explicit.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: dc38061bee468ebfbfa3c89f0bb5b2edb5fd5147
Component: engine
2015-12-30 01:30:56 -08:00
354272cd56 bump docker-py
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d34bbb66d5d5f2f07b8f0c1b63df5f058f20b436
Component: engine
2015-12-28 10:26:52 -08:00
aac8048807 add default seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a48fe6238494547f392b06adf9d48944b4dd8ac3
Component: engine
2015-12-28 10:26:48 -08:00
73614850c7 Don't build Darwin 32-bit binaries
The last 32-bit OS X computers were built in 2006,
so we probably don't need these anymore.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 814ce44d5ad442b940e44b41eff00bac0e579fc6
Component: engine
2015-12-22 00:08:18 +01:00
fb4d3eebd9 Merge pull request #18417 from jfrazelle/remove-parallel
remove parallel we no longer use it
Upstream-commit: 0b930e8fec026f0a7c84e3bccbc375c2443ae33d
Component: engine
2015-12-09 16:26:02 -08:00
ab6c9709f6 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
8b297d72a8 remove parallel we no longer use it
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 19e5c0123060129c2529221ed5a6e7c41de22b5b
Component: engine
2015-12-03 17:04:01 -08:00
1c9031a8a0 update go version
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b7b707af2e617d62343391c6c82b984ff41b08e2
Component: engine
2015-12-03 16:37:13 -08:00
bb9f4fa0e8 dockerfile update for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d616a097638bc73a652bcf5f7b25465c25bfaa83
Component: engine
2015-12-03 16:20:03 -08:00
71b21cf347 This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: b3e527dfd242ad30c0297c8b257862116cf2c50e
Component: engine
2015-12-02 10:06:59 -05:00
66c2c983d6 update go-md2man because code.google.com needs to go away
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6842c906c44fefeb3ca78aae550e64341e040391
Component: engine
2015-12-01 16:02:40 -08:00
a29b07bf59 update download-frozen-image.sh to v2 registry
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 359d0c247fe523ef82676f9ae4046b79e6854fe1
Component: engine
2015-12-01 13:16:42 -08:00
9f1a5d95f2 Dockerfile: add python-dev to fix Python.h errors
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 92756bdcdddc75bcf5aa7dab2c8238abdb18ab75
Component: engine
2015-11-22 12:32:10 +02:00
2672323db9 update for mac
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6c818f3e5f1bb4966c8fb54aa0c412360c9094fe
Component: engine
2015-11-13 13:20:54 -08:00
c3491d2f3b add buildtag pkcs11 to experimental
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 141369457ffaeee79154f4b649525f5c8b3d5f2e
Component: engine
2015-11-13 13:20:49 -08:00
d41faf6fe1 Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
update release script and release process
Upstream-commit: 8b9856dbd7a1981aaa76fcf0fc10b37d1141c9af
Component: engine
2015-11-12 09:51:36 -08:00
83fc2cf8e7 Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1
Component: engine
2015-11-11 14:42:08 -08:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
5805b4b796 update release script and release process
Signed-off-by: Jessica Frazelle <princess@docker.com>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d0a4b216a68d0ea27b4604330ed779fa5ed96c35
Component: engine
2015-11-04 16:20:04 -08:00
27be2339e6 Update linting tools
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c70d1bde63a1370d86ea8af17cda17920fdc9fb7
Component: engine
2015-11-02 08:32:49 -08:00
b78e8b7756 docker-py: upgrade and fix test script
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
99471f9ab2 update to binaries, fix parsers package, non-parallel test unit
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
2015-10-27 14:43:25 -07:00
e7265101a5 Dockerfile: bump Go to 1.5
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 42dcc4f3b5e0ddd2042a75c5d3f3c610d7e839c1
Component: engine
2015-10-27 10:56:49 -07:00