summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #94 from dperny/18.09-bump-swarmkitv18.09.0-beta5Andrew Hsu2018-10-2270-135/+106
|\
| * Bump swarmkitDrew Erny2018-10-2270-135/+106
|/
* Merge pull request #64 from thaJeztah/18.09_backport_syslogAndrew Hsu2018-10-222-2/+26
|\
| * Move the syslog syscall to be gated by CAP_SYS_ADMIN or CAP_SYSLOGJustin Cormack2018-10-022-2/+26
* | Merge pull request #93 from ctelfer/18.09-backport-dsrMadhu Venugopal2018-10-199-51/+166
|\ \
| * | Bump libnetwork to 6da50d19 for DSR changesChris Telfer2018-10-189-51/+166
* | | Merge pull request #88 from tonistiigi/fix-private-pull-1809Tibor Vass2018-10-181-2/+2
|\ \ \ | |/ / |/| |
| * | builder: fix private pulls on buildkitTonis Tiigi2018-10-171-2/+2
|/ /
* | Merge pull request #86 from kolyshkin/18.09-backport-btrfs-propAndrew Hsu2018-10-122-9/+36
|\ \
| * | btrfs: ensure graphdriver home is bind mountKir Kolyshkin2018-10-121-1/+24
| * | pkg/mount: add MakeMount()Kir Kolyshkin2018-10-121-6/+13
| * | pkg/mount: simplify ensureMountedAsKir Kolyshkin2018-10-121-4/+1
* | | Merge pull request #82 from tiborvass/18.09-buildkit-cherry-picksAndrew Hsu2018-10-121-0/+3
|\ \ \
| * | | builder: treat unset keep-storage as 0Tibor Vass2018-10-111-0/+3
* | | | Merge pull request #83 from thaJeztah/18.09_backport_bump_buildkitAndrew Hsu2018-10-1263-488/+1756
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | bump buildkit to c7bb575343df0cbfeab8b5b28149630b8153fcc6Sebastiaan van Stijn2018-10-118-12/+71
| * | bump up buildkitAkihiro Suda2018-10-1160-477/+1686
* | | Merge pull request #75 from thaJeztah/18.09_backport_bump_containerd_client_1...Tibor Vass2018-10-1197-978/+2971
|\ \ \
| * | | Update containerd client and dependencies to v1.2.0-rc.1Sebastiaan van Stijn2018-10-0583-574/+2066
| * | | Update containerd dependenciesSebastiaan van Stijn2018-10-0515-404/+905
* | | | Merge pull request #73 from thaJeztah/18.09_backport_addr_poolTibor Vass2018-10-113-1/+41
|\ \ \ \
| * | | | Fix for default-addr-pool-mask-length param max value checkselansen2018-10-041-1/+6
| * | | | Global Default AddressPool - Updateselansen2018-10-043-1/+36
* | | | | Merge pull request #70 from thaJeztah/18.09_backport_upstream_dos_fixTibor Vass2018-10-114-4/+53
|\ \ \ \ \
| * | | | | Fix denial of service with large numbers in cpuset-cpus and cpuset-memsJustin Cormack2018-10-054-4/+53
| |/ / / /
* | | | | Merge pull request #72 from thaJeztah/18.09_backport_esc-879Tibor Vass2018-10-113-4/+72
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Masking credentials from proxy URLDani Louca2018-10-043-4/+72
| |/ / /
* | | | Merge pull request #76 from seemethere/dockerfile_copy_1809Eli Uriegas2018-10-081-1/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Switch copy image to a docker org based oneEli Uriegas2018-10-051-1/+3
|/ / /
* | | Merge pull request #66 from thaJeztah/18.09_backport_fix-dm-errmsgv18.09.0-beta3Sebastiaan van Stijn2018-10-041-1/+1
|\ \ \ | |/ / |/| |
| * | gd/dm: fix error messageKir Kolyshkin2018-10-031-1/+1
| |/
* | Merge pull request #67 from thaJeztah/18.09_backport_windows-network-plugin-m...Sebastiaan van Stijn2018-10-031-1/+2
|\ \ | |/ |/|
| * Fix long startup on windows, with non-hns governed Hyper-V networksSimon Ferquel2018-10-031-1/+2
|/
* Merge pull request #62 from thaJeztah/18.09_backport_tweak_error_messageAndrew Hsu2018-09-283-4/+4
|\
| * Tweak bind mount errorsSebastiaan van Stijn2018-09-283-4/+4
* | Merge pull request #56 from thaJeztah/18.09_backport_more_permissive_daeon_co...Andrew Hsu2018-09-281-1/+1
|\ \
| * | Loosen permissions on /etc/docker directorySebastiaan van Stijn2018-09-181-1/+1
* | | Merge pull request #63 from tiborvass/18.09-vndr-buildkitAndrew Hsu2018-09-2813-56/+283
|\ \ \ | |_|/ |/| |
| * | vendor buildkit to 8f4dff0d16ea91cb43315d5f5aa4b27f4fe4e1f2Tibor Vass2018-09-2713-56/+283
|/ /
* | Merge pull request #61 from tiborvass/18.09-remove-docker-prefix-containerdEli Uriegas2018-09-2616-49/+61
|\ \
| * | fix daemon tests that were using wrong containerd socketTibor Vass2018-09-252-5/+7
| * | hack/make: remove 'docker-' prefix when copying binariesTibor Vass2018-09-251-4/+4
| * | Remove 'docker-' prefix for containerd and runc binariesTibor Vass2018-09-2415-41/+51
|/ /
* | Merge pull request #51 from thaJeztah/18.09_backport_fix-libcontainerd-startu...Andrew Hsu2018-09-221-4/+11
|\ \
| * | Add fail fast path when containerd fails on startupDerek McGowan2018-09-141-4/+11
* | | Merge pull request #60 from tiborvass/18.09-remove-boltdbAndrew Hsu2018-09-22157-7989/+5878
|\ \ \
| * | | vendor: remove boltdb dependency which is superseded by bboltTibor Vass2018-09-22157-7989/+5878
* | | | Merge pull request #59 from tonistiigi/buildkit-1809Andrew Hsu2018-09-2194-400/+8216
|\ \ \ \ | |/ / /
| * | | builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5Tibor Vass2018-09-2148-342/+2140
| * | | builder: use buildkit's GC for build cacheTibor Vass2018-09-218-32/+201