summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26 from thaJeztah/18.06-backport-fix_TestExternalGraphDri...v18.06.0-ceAndrew Hsu2018-07-181-2/+2
|\
| * Fix flaky TestExternalGraphDriver/pull testSebastiaan van Stijn2018-07-171-2/+2
* | Merge pull request #22 from thaJeztah/18.06-backport-errorfixAndrew Hsu2018-07-181-0/+1
|\ \
| * | Fix error string in docker CLI testSandeep Bansal2018-07-121-0/+1
* | | Merge pull request #27 from thaJeztah/18.06-backport-bump_swarmkitAndrew Hsu2018-07-184-3/+26
|\ \ \ | |_|/ |/| |
| * | Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6Sebastiaan van Stijn2018-07-174-3/+26
|/ /
* | Merge pull request #24 from thaJeztah/18.06-backport-fix-internalAndrew Hsu2018-07-161-2/+2
|\ \
| * | Fix flakyness in TestDockerNetworkInternalModeFlavio Crisciani2018-07-151-2/+2
|/ /
* | Merge pull request #20 from thaJeztah/18.06-backport-do_not_Healthcheck_RUN_c...v18.06.0-ce-rc3Andrew Hsu2018-07-113-1/+75
|\ \ | |/ |/|
| * Ensure RUN instruction to run without HealthcheckYuichiro Kaneko2018-07-113-1/+75
* | Merge pull request #19 from thaJeztah/18.06-backport-bump_libnetworkSebastiaan van Stijn2018-07-113-18/+12
|\ \
| * | Bump libnetwork to d00ceed44cc447c77f25cdf5d59e83163bdcb4c9Sebastiaan van Stijn2018-07-113-18/+12
| |/
* | Merge pull request #18 from tiborvass/18.06-mountable-bugfixSebastiaan van Stijn2018-07-112-30/+51
|\ \ | |/ |/|
| * builder: fix duplicate calls to mountableTonis Tiigi2018-07-112-30/+51
|/
* Merge pull request #17 from thaJeztah/18.06-backport-bump_containerd_1.1.1Andrew Hsu2018-07-101-1/+1
|\
| * Bump containerd daemon to v1.1.1Brian Goff2018-07-101-1/+1
* | Merge pull request #15 from thaJeztah/18.06-backport-vendor-containerdAndrew Hsu2018-07-1024-85/+271
|\ \
| * | vendor: update containerd to b41633746Tonis Tiigi2018-07-0924-85/+271
* | | Merge pull request #16 from thaJeztah/18.06-backport-scalable-lbAndrew Hsu2018-07-1055-674/+892
|\ \ \ | |_|/ |/| |
| * | Bump libnetwork to 3ac297bcChris Telfer2018-07-0942-165/+337
| * | Update moby to use scalable-lb libnetwork APIsChris Telfer2018-07-091-36/+2
| * | bump libnetwork to b0186632Chris Telfer2018-07-0920-481/+561
| |/
* | Merge pull request #11 from thaJeztah/18.06-fix_bindmount_src_create_raceAndrew Hsu2018-07-092-0/+15
|\ \ | |/ |/|
| * Fix bindmount autocreate raceBrian Goff2018-07-052-0/+15
* | Merge pull request #13 from thaJeztah/18.06-backport_bump-swarmkitAndrew Hsu2018-07-086-36/+548
|\ \
| * | Bump swarmkit to include task reaper fixes and more metrics.Ying Li2018-07-066-36/+548
| |/
* | Merge pull request #14 from thaJeztah/18.06-backport-CVE-2018-10892Andrew Hsu2018-07-061-0/+1
|\ \ | |/ |/|
| * Add /proc/acpi to masked pathsAntonio Murdaca2018-07-061-0/+1
|/
* Merge pull request #4 from thaJeztah/18.06-backport-register-oci-mediatypesv18.06.0-ce-rc2Andrew Hsu2018-07-052-0/+47
|\
| * Register OCI image media typesDerek McGowan2018-07-032-0/+47
* | Merge pull request #3 from thaJeztah/18.06-backport-update-windows-manifest-s...Andrew Hsu2018-07-051-3/+7
|\ \
| * | LCOW: Prefer Windows over Linux in a manifest listJohn Stephens2018-07-031-3/+7
| |/
* | Merge pull request #2 from thaJeztah/18.06-update_go_winioAndrew Hsu2018-07-052-11/+6
|\ \
| * | Update Microsoft/go-winio to 0.4.8Sebastiaan van Stijn2018-07-032-11/+6
| |/
* | Merge pull request #10 from thaJeztah/18.06-update_buildkitAndrew Hsu2018-07-0514-98/+159
|\ \
| * | vendor: update buildkit to 9acf51e491Tonis Tiigi2018-07-0413-93/+154
| * | builder: do not send duplicate status for completed jobsTonis Tiigi2018-07-041-5/+5
* | | Merge pull request #1 from thaJeztah/18.03-update-containerd-1.1.1-rc.2Tibor Vass2018-07-051-1/+1
|\ \ \
| * | | Update containerd to v1.1.1-rc.2Derek McGowan2018-07-031-1/+1
| | |/ | |/|
* | | Merge pull request #7 from tiborvass/18.06-cpAndrew Hsu2018-07-0512-72/+74
|\ \ \ | |_|/ |/| |
| * | api: Change Platform field back to string (temporary workaround)Tibor Vass2018-07-049-43/+60
| * | builder: return image ID in API when using buildkitTibor Vass2018-07-036-29/+14
| |/
* | Merge pull request #5 from thaJeztah/18.06-bump-libnetworkAndrew Hsu2018-07-0316-84/+598
|\ \ | |/ |/|
| * Update tests w/ new libnetwork contraintsChris Telfer2018-07-031-6/+6
| * bump libnetwork to 430c00aChris Telfer2018-07-0315-78/+592
|/
* Merge pull request #37350 from tonistiigi/platform-supportv18.06.0-ce-rc1Tibor Vass2018-06-2767-821/+1952
|\
| * distribution: remove custom matcher codeTonis Tiigi2018-06-271-26/+4
| * system: add back lcow validation functionTonis Tiigi2018-06-275-3/+34
| * builder: update platform support to pullerTonis Tiigi2018-06-272-12/+26
| * distribution: fix passing platform struct to pullerTonis Tiigi2018-06-2719-127/+207