Commit Graph
37584 Commits
Author SHA1 Message Date
John Howard eb420d5366 LCOW: Image exporter update
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e05cedcbf9efcfe864574dea054a71665cf089b6
Component: engine
2017-06-20 19:49:54 -07:00
John Howard ebc74326cd LCOW: Fix ImageCache to address right store
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba40132366e196c740cdf2d2f1cbee7ead955d2f
Component: engine
2017-06-20 19:49:53 -07:00
John Howard 30a1a8646e LCOW: Store integrity checks
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 87abf34a3d7bb63e3948eb1d801ac43b379d779e
Component: engine
2017-06-20 19:49:53 -07:00
John Howard 2665467b29 LCOW: Builder plumbing
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 08252bc963a20b2fb3052fc8db7143771c8c3248
Component: engine
2017-06-20 19:49:53 -07:00
John Howard 094f300460 LCOW: pull goes to correct stores
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a1fe1dc791633998bcc82b5f0734a5da68d2bb41
Component: engine
2017-06-20 19:49:52 -07:00
John Howard 0e82890827 LCOW: commit to use image platform, not host
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8f5378069444fba89e43b95e95d5ac630b33d90b
Component: engine
2017-06-20 19:49:52 -07:00
John Howard 3af9801344 LCOW: Move daemon stores to per platform
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3aa4a0071536d3b106374eaa44d8a55765901aa6
Component: engine
2017-06-20 19:49:52 -07:00
John Howard 5ce127c469 LCOW: Add platform to image store
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6c336849876c2117381618b577f1b24f1fb85571
Component: engine
2017-06-20 19:49:51 -07:00
John Howard 767c3943b7 LCOW: Add platform to container, init on FromDisk()
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f97fbba5cec3d27099e230f7c1dc278c54180d74
Component: engine
2017-06-20 19:49:51 -07:00
John Howard 97b623b9f6 LCOW: Graphdriver
Signed-off-by: John Howard <jhoward@microsoft.com>

Adds the graphdriver for Linux containers on Windows
Upstream-commit: ed4d2aa981a9057766a9cec53c3bd19be4eef059
Component: engine
2017-06-20 19:49:24 -07:00
Ying Li 8a5a7a8a1e If docker swarm ca is not called with the --rotate flag, the other
flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 32b43bc21a
Component: cli
2017-06-20 18:55:10 -07:00
Aaron Lehmann 60028ea97d image: Improve store locking
This showed up in a recent profile.

Search doesn't need to take a lock on the store, because digestset has
its own locking.

Some other methods can get by with a read lock instead of an exclusive
lock.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 44e67adae5695e3e2c3b450453ab0fe6119eb80d
Component: engine
2017-06-20 18:31:29 -07:00
Brian Goff dee43e0b2b Merge pull request #33694 from shakeme/master
Small fix and new option for contrib/mkimage_alpine.sh
Upstream-commit: 88bddd46d8ff0df7098624554bdc62deb2c84a7a
Component: engine
2017-06-20 17:00:30 -07:00
Brian Goff 2dbec80975 Merge pull request #176 from dnephin/new-lint
New linters
Upstream-commit: 2bfac7fcda
Component: cli
2017-06-20 16:47:45 -07:00
Brian Goff c196fc8ae5 Merge pull request #195 from Zebrilee/fix-issue-114
fix the issue `--help` doesn't work if daemon is not available
Upstream-commit: 760f847bc8
Component: cli
2017-06-20 16:38:36 -07:00
Eli Uriegas 9ec73b6716 Specify the make variables, add docker-ce example
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c57562d148886f1fb892db1e4604eb2399cc7399
Component: packaging
2017-06-20 16:23:43 -07:00
Brian Goff 6752b15b06 Merge pull request #93 from dave-tucker/proxyConfig
Allow Proxy Configuration in config.json
Upstream-commit: 6f6ccbd6bc
Component: cli
2017-06-20 16:15:19 -07:00
Brian Goff 02b551dece Merge pull request #33587 from bergwolf/aufs
fix aufs mount option length calculation
Upstream-commit: 226bf3e0d92511d20792b1dd1bf72fb3eb67b6a9
Component: engine
2017-06-20 15:51:42 -07:00
Tonis Tiigi d3db128900 builder: fix copy —from conflict with force pull
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c268d9da4b658b2dd1fe48010a8929b603913e92
Component: engine
2017-06-20 15:45:33 -07:00
Sebastiaan van Stijn 8f64a8f93c Fix Markdown formatting of experimental "stacks"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c5301ca35d
Component: cli
2017-06-20 15:15:08 -07:00
Eli Uriegas cc33574a88 bump RPM changelog version to 17.06.0-ce
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 7e955d1f0c8c011058d7291d4c0dd2f0e65e4b8e
Component: packaging
2017-06-20 14:25:27 -07:00
Eli Uriegas 1314e42d84 Adds operating instructions
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a1a29c1440d5396d2a1be4e933472188554ad61f
Component: packaging
2017-06-20 14:12:18 -07:00
Brian Goff 2a96330e2c Merge pull request #33639 from thaJeztah/cleanup-TestServiceCreateCompatiblePlatforms
Make TestServiceCreateCompatiblePlatforms use actual API response
Upstream-commit: c621330ba928c85e8c576b0d89ecbf985f5bdf5c
Component: engine
2017-06-20 13:57:06 -07:00
Brian Goff 6220fae10d Merge pull request #33097 from stevvooe/remove-random-pkg
pkg: remove random package
Upstream-commit: b5f68d7ed3a2a9db7bdbfd3bdee42d9d1a7e5423
Component: engine
2017-06-20 13:43:38 -07:00
John Howard 56c93a237b Show what cross-build is executing
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: cdc39033effc940eda23854d3b5afbf706a8d17a
Component: engine
2017-06-20 13:30:51 -07:00
Brian Goff 3814817472 Remove OSX cross stuff from main Dockerfile
This is no longer needed here. It was required for compiling the CLI
which we no longer do here.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 57f0e0c61982269093eb6d9934656ea70b573938
Component: engine
2017-06-20 13:06:37 -07:00
Arash Deshmeh e2861e049e add unit tests to stack package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 535af2d868
Component: cli
2017-06-20 14:31:00 -04:00
John Howard 7ded95d08c LCOW: Deprecate storagedriver option
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 01e597ca4351b83e32346c32ad510f03b0b3b95b
Component: engine
2017-06-20 09:21:37 -07:00
John Howard 8508f49b3f LCOW: Pass platform through into layer store
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 42c5c1a9ec14f00d5a5367131493cbd6de7d72b0
Component: engine
2017-06-20 09:21:37 -07:00
John Howard 04857f417d LCOW: Adds platform to the layer store
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fc21bf280bac39377d3a236efa87f5c8cbadfb9f
Component: engine
2017-06-20 09:00:32 -07:00
John Howard dd6f4eb487 LCOW: Remove CommonContainer - just Container
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 55f8828eec1ff6c70628a0b6f22bea175ce36159
Component: engine
2017-06-20 08:55:46 -07:00
John Howard cad0e361c3 LCOW: Add environment variable to enable
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fe5b34ba8828dc2f2f7db180a102cee360fec6e0
Component: engine
2017-06-20 08:55:46 -07:00
Dave Tucker d49d72e7d6 Allow Proxy Configuration in config.json
This commit modifies config.json to allow for any proxies allowed in
build-args to be configured. These values will then be used
by default as build-args in docker build.

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 35f1e301b5
Component: cli
2017-06-20 09:51:41 +01:00
Vincent Demeester 8c7c972d20 Merge pull request #33454 from dnephin/refactor-builder-remove-copy-on-build
[Builder] Move file coping from the daemon to the builder
Upstream-commit: 99c72eb2682c0539ad3cc544eb28876af78b33a1
Component: engine
2017-06-20 10:12:57 +02:00
Andrew Hsu aa2281f8d3 Merge pull request #23 from seemethere/increment_to_rc5
bump Version to 17.06.0-ce-rc5
Upstream-commit: 3f1a023d0c1b474ef82f4c0fd2c2b730bed32281
Component: packaging
2017-06-19 23:42:46 -07:00
Andrew Hsu 7819b28c1f Merge pull request #20 from andrewhsu/restart
restart docker service if needed for rpm upgrade
Upstream-commit: 7267953ecb55a0c0ac73cc04edd68746e725105c
Component: packaging
2017-06-19 23:40:24 -07:00
Andrew Hsu a189d6d755 restart docker service if needed for rpm upgrade
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3152177fdd93d6e3d8c930600bd9bff4f9a36e1d
Component: packaging
2017-06-20 06:33:07 +00:00
Akihiro Suda 077c312216 Merge pull request #33725 from ripcurld0/deprecate_go16
Remove Go 1.6 code from moby
Upstream-commit: 93c06b801334713f88e92838f67cf322e6eb808b
Component: engine
2017-06-20 08:54:01 +03:00
Brian Schwind 125062e5cf Add note to CopyToContainer documentation
Signed-off-by: Brian Schwind <brianmschwind@gmail.com>
Upstream-commit: 1c3071e487db96ba8274ac2388eca0002e9cee77
Component: engine
2017-06-20 14:49:38 +09:00
Andrew Hsu 06b45c7fcc Merge pull request #24 from andrewhsu/conflict
also have deb pkg conflict docker-engine
Upstream-commit: 405d7d99610ff686a7c24ec0ce404d7e45fa6795
Component: packaging
2017-06-19 21:05:16 -07:00
Andrew Hsu 1a754b3d95 also have deb pkg conflict docker-engine
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f7ad018c91316588a756e4e97cd48c246b2c1419
Component: packaging
2017-06-20 03:55:08 +00:00
Flavio Crisciani ea569af511 Libnetwork vendoring
Fixes in the Service Discovery areas

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: e1953f1ca717c2609a0ee801c8af5b874d9fc3d2
Component: engine
2017-06-19 19:42:24 -07:00
Eli Uriegas 4b4c229f4e Prefixes documentation files per component (#21)
* Prefixes documentation files per component

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>

* Remove reliance on basename

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 24e443c109ae5e133f1b20e6c4f9a17126767c71
Component: packaging
2017-06-19 18:29:22 -07:00
Eli Uriegas 0badb5dd2c bump Version to 17.06.-ce-rc5
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: d9b0a3c4106bd9edb38c38f968fab47409c8eeb1
Component: packaging
2017-06-19 18:25:00 -07:00
Andrew Hsu 77f12eb0fe Merge pull request #18 from cpuguy83/conflicts_docker_ee
Add conflicts with docker-ee
Upstream-commit: c5ed65456c22e4ea514eb730ed25378669a3c6f4
Component: packaging
2017-06-19 14:16:55 -07:00
Sebastiaan van Stijn 0a8fc1d6f6 Merge pull request #33522 from naveed-jamil-tenpearls/pkg/promise
Added Test Case Coverage for PKG/PROMISE
Upstream-commit: 16380b3ee68c0da2fda036d7980129241957220c
Component: engine
2017-06-19 13:53:42 -07:00
Brian Goff 51efe95e2e Merge pull request #33732 from nhorman/cookie-clean-up
devmapper: ensure that UdevWait is called after calls to setCookie
Upstream-commit: 7e3d0a54a136f66f85633a3ffa25004ecf7d19bf
Component: engine
2017-06-19 13:26:02 -07:00
Neil Horman 37ac27cec4 devmapper: ensure that UdevWait is called after calls to setCookie
Recent changes to devmapper broke the implicit requirement that UdevWait be
called after every call to task.setCookie.  Failure to do so results in leaks of
semaphores in the LVM code, eventually leading to semaphore exhaustion.
Previously this was handled by calling UdevWait in a ubiquitous defer function.
While there was initially some concern with deferring the UdevWait function
would cause some amount of race possibiliy, the fact that we never return the
cookie value or any value used to find it, makes that possibility seem unlikely,
so lets go back to that method

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Upstream-commit: 23dcfec1404411489e23fb9b76fc7096db139d04
Component: engine
2017-06-19 13:50:57 -04:00
Brian Goff aae660696a Merge pull request #33695 from cpuguy83/volumes_check_ownership
Don't chown/chmod volumes if not needed.
Upstream-commit: 630b9a45d2537a21fa5ba3249a3c780d2b6a00fc
Component: engine
2017-06-19 06:31:58 -07:00
Boaz Shuster c832750e54 Remove Go 1.6 code from moby
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 6bfd0f6b5d08bcd609da11947432ad0f3aa3d8fd
Component: engine
2017-06-19 15:59:00 +03:00