summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: Validate layer digest formatv19.03.15jenkins-test-2Brian Goff2021-01-282-0/+9
* buildkit: Apply apparmor profileBrian Goff2021-01-287-3/+19
* vendor buildkit 396bfe20b590914cd77945ef0d70d976a0ed093cTibor Vass2021-01-284-10/+51
* Use real root with 0701 permsBrian Goff2021-01-2811-50/+43
* Do not set DOCKER_TMP to be owned by remapped rootBrian Goff2021-01-281-5/+3
* Ensure MkdirAllAndChown also sets permsBrian Goff2021-01-282-7/+18
* Merge pull request #41731 from thaJeztah/19.03_container_1.3.9v19.03.14Akihiro Suda2020-12-011-1/+1
|\
| * update containerd binary to v1.3.9 (address CVE-2020-15257)Sebastiaan van Stijn2020-11-301-1/+1
| * update containerd binary to v1.3.8Sebastiaan van Stijn2020-11-301-1/+1
|/
* Merge pull request #41685 from ameyag/19.03-bmp-libnetwork-nil-deferenceBrian Goff2020-11-183-5/+6
|\
| * Bump libnetworkAmeya Gawde2020-11-173-5/+6
|/
* Merge pull request #41635 from AkihiroSuda/rootlesskit-0.11.0-1903Sebastiaan van Stijn2020-11-091-2/+2
|\
| * bump up rootlesskit to v0.11.0Akihiro Suda2020-11-051-2/+2
|/
* Merge pull request #41596 from thaJeztah/19.03_backport_swagger_fixAkihiro Suda2020-10-293-5/+5
|\
| * docs: fix builder-version swaggerTonis Tiigi2020-10-273-5/+5
|/
* Merge pull request #41557 from AkihiroSuda/cherrypick-41156-1903Brian Goff2020-10-161-1/+1
|\
| * dockerd-rootless.sh: support containerd v1.4 shim socket path conventionAkihiro Suda2020-10-161-1/+1
|/
* Merge pull request #41542 from thaJeztah/19.03_backport_fix_41517Brian Goff2020-10-092-0/+27
|\
| * Also trim "~..." from AppArmor versionsTianon Gravi2020-10-092-0/+10
| * pkg/aaparser: support parsing version like "3.0.0-beta1"Akihiro Suda2020-10-092-0/+17
|/
* Merge pull request #41522 from thaJeztah/19.03_backport_gcp_leakBrian Goff2020-10-061-1/+3
|\
| * Fix gcplogs memory/connection leakPatrick Haas2020-10-031-1/+3
|/
* Merge pull request #41293 from thaJeztah/19.03_backport_fix_getexecuserTianon Gravi2020-09-251-1/+8
|\
| * oci: correctly use user.GetExecUser interfaceAleksa Sarai2020-07-291-1/+8
* | Merge pull request #41494 from thaJeztah/19.03_backport_aws_sdk_goBrian Goff2020-09-25150-6445/+16456
|\ \
| * | awslogs: Update aws-sdk-go to support IMDSv2Samuel Karp2020-09-25150-6445/+16456
|/ /
* | Merge pull request #41314 from thaJeztah/19.03_backport_fix_racey_logger_testv19.03.13Tibor Vass2020-09-161-10/+21
|\ \
| * | Fix log file rotation test.Brian Goff2020-08-051-3/+3
| * | Fix flakey test for log file rotate.Brian Goff2020-08-051-10/+21
* | | Merge pull request #41451 from thaJeztah/19.03_update_buildkitTibor Vass2020-09-151-1/+1
|\ \ \
| * | | [19.03] vendor: buildkit v0.6.4-32-gdf89d4dcSebastiaan van Stijn2020-09-151-1/+1
| |/ /
* | | Merge pull request #41446 from thaJeztah/19.03_backport_swagger_fixesTibor Vass2020-09-1510-10/+10
|\ \ \
| * | | swagger: fix MemTotal units in SystemInfo endpointNikolay Edigaryev2020-09-1410-10/+10
| |/ /
* | | Merge pull request #41312 from thaJeztah/19.03_backport_pass_network_errorTibor Vass2020-09-151-2/+1
|\ \ \
| * | | Check for context error that is wrapped in url.ErrorEvgeniy Makhrov2020-08-041-2/+1
| |/ /
* | | Merge pull request #41334 from thaJeztah/19.03_backport_bump_golang_1.13.15Tibor Vass2020-09-154-4/+4
|\ \ \
| * | | Bump Golang 1.13.15Sebastiaan van Stijn2020-08-104-4/+4
| |/ /
* | | Merge pull request #40408 from thaJeztah/19.03_backport_update_containerd_1.3Tibor Vass2020-09-151-1/+1
|\ \ \ | |/ / |/| |
| * | update containerd to v1.3.7Akihiro Suda2020-08-051-1/+1
| * | update containerd to v1.3.6Jintao Zhang2020-08-051-1/+1
| * | update containerd to v1.3.5Jintao Zhang2020-08-051-1/+1
| * | update containerd to v1.3.4Jintao Zhang2020-08-051-1/+1
| * | update containerd binary to v1.3.3Sebastiaan van Stijn2020-08-051-1/+1
| * | Update containerd to v1.3.2Jintao Zhang2020-08-051-1/+1
| * | Update containerd to v1.3.1Jintao Zhang2020-08-051-1/+1
| * | update containerd binary v1.3.0Derek McGowan2020-08-051-1/+1
|/ /
* | Merge pull request #41287 from thaJeztah/19.03_backport_bump_netnsv19.03.13-beta2Tibor Vass2020-07-314-40/+73
|\ \ | |/ |/|
| * vendor: vishvananda/netns db3c7e526aae966c4ccfa6c8189b693d6ac5d202Sebastiaan van Stijn2020-07-294-40/+70
| * [19.03] vendor: vishvananda/netns 0a2b9b5464df8343199164a0321edf3313202f7eSebastiaan van Stijn2020-07-292-1/+4
|/
* Merge pull request #41273 from thaJeztah/19.03_backport_swagger_fixesv19.03.13-beta1Tibor Vass2020-07-283-177/+336
|\