summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #45551 from tianon/rm-upstartHEADmasterBjorn Neergaard2023-05-182-73/+1
|\ | | | | Remove Upstart scripts
| * Remove Upstart scriptsTianon Gravi2023-05-172-73/+1
|/ | | | | | Upstart has been EOL for 8 years and isn't used by any distributions we support any more. Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
* Merge pull request #45505 from neersighted/mailmap_updateTianon Gravi2023-05-172-1/+10
|\ | | | | mailmap update and regenerate AUTHORS
| * AUTHORS: regenerateBjorn Neergaard2023-05-091-1/+7
| | | | | | | | Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
| * .mailmap: update with my new emailBjorn Neergaard2023-05-091-0/+3
| | | | | | | | Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
* | Merge pull request #45469 from thaJeztah/deprecate_virtualsize_STEP2Akihiro Suda2023-05-169-38/+29
|\ \ | | | | | | API: omit deprecated VirtualSize field for API v1.44 and up
| * | API: omit deprecated VirtualSize field for API v1.44 and upSebastiaan van Stijn2023-05-069-38/+29
| | | | | | | | | | | | | | | | | | | | | | | | This field is deprecated since 1261fe69a3586bb102182aa885197822419c768c, and will now be omitted on API v1.44 and up for the `GET /images/json`, `GET /images/{id}/json`, and `GET /system/df` endpoints. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #45512 from thaJeztah/libnetwork_fix_readme_exampleSebastiaan van Stijn2023-05-152-7/+2
|\ \ \ | | | | | | | | libnetwork: update example in README.md
| * | | libnetwork/docs: fix broken linkSebastiaan van Stijn2023-05-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | libnetwork: update example in README.mdSebastiaan van Stijn2023-05-101-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Align the example with the code updated in 4e0319c87857f180b01f9b072603cc385d7fcee1. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | Merge pull request #45536 from thaJeztah/containerd_binary_1.7.1Sebastiaan van Stijn2023-05-153-3/+3
|\ \ \ \ | | | | | | | | | | update containerd binary to v1.7.1
| * | | | update containerd binary to v1.7.1Sebastiaan van Stijn2023-05-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/containerd/containerd/compare/v1.7.0...v1.7.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | Merge pull request #44395 from jmrouet/masterBjorn Neergaard2023-05-121-7/+14
|\ \ \ \ \ | |/ / / / |/| | | | Fixing dockerd-rootless-setuptools.sh when user name contains a backslash
| * | | | more robust dockerd-rootless-setuptools.shJean-Michel Rouet2023-05-121-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing case where username may contain a backslash. This case can happen for winbind/samba active directory domain users. Signed-off-by: Jean-Michel Rouet <jean-michel.rouet@philips.com> Use more meaningful variable name Signed-off-by: Jean-Michel Rouet <jean-michel.rouet@philips.com> Update contrib/dockerd-rootless-setuptool.sh Co-authored-by: Akihiro Suda <suda.kyoto@gmail.com> Signed-off-by: Jean-Michel Rouet <jean-michel.rouet@philips.com> Use more meaningful variable name Signed-off-by: Jean-Michel Rouet <jean-michel.rouet@philips.com> Update contrib/dockerd-rootless-setuptool.sh Co-authored-by: Akihiro Suda <suda.kyoto@gmail.com> Signed-off-by: Jean-Michel Rouet <jean-michel.rouet@philips.com>
* | | | | Merge pull request #45484 from thaJeztah/remove_deprecated_stubsSebastiaan van Stijn2023-05-1218-175/+8
|\ \ \ \ \ | | | | | | | | | | | | remove deprecated types, fields, and functions
| * | | | | daemon: remove handling for deprecated "oom-score-adjust", and produce errorSebastiaan van Stijn2023-05-0610-76/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was deprecated in 5a922dc162bbe0a03450165da4e6aceca55073d4, which is part of the v24.0.0 release, so we can remove it from master. This patch; - adds a check to ValidatePlatformConfig, and produces a fatal error if oom-score-adjust is set - removes the deprecated libcontainerd/supervisor.WithOOMScore - removes the warning from docker info With this patch: dockerd --oom-score-adjust=-500 --validate Flag --oom-score-adjust has been deprecated, and will be removed in the next release. unable to configure the Docker daemon with file /etc/docker/daemon.json: merged configuration validation from file and command line flags failed: DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" options have been removed. And when using `daemon.json`: dockerd --validate unable to configure the Docker daemon with file /etc/docker/daemon.json: merged configuration validation from file and command line flags failed: DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" options have been removed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | api/types/container: remove deprecated ContainerChangeResponseItemSebastiaan van Stijn2023-05-061-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was deprecated in dbb48e4b29e124aef6716ee8ad6856bf696235ca, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | api/types: remove deprecated AuthConfigSebastiaan van Stijn2023-05-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was deprecated in 818ee962196d668b6d405835c88c1ac6cdab7423, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | pkg/system: remove deprecated IsProcessAlive, IsProcessZombie, KillProcessSebastiaan van Stijn2023-05-062-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were deprecated in 9d5e754caad0af212545b352e19c3085d8df3281, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | pkg/system: remove deprecated DefaultPathEnv()Sebastiaan van Stijn2023-05-061-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was deprecated in 9f3e5eead5accb9fb405398af700d97e830a3b5b, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | pkg/system: remove deprecated MemInfo, ReadMemInfo()Sebastiaan van Stijn2023-05-061-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were deprecated in 2d490800565c410af8564844f52cd9fa34c7b1bf, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | pkg/ioutils: remove deprecated TempDir() aliasSebastiaan van Stijn2023-05-061-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function was deprecated in c63ea32a1780bfd063c2a6bc5dcaefe4026f27e9, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | pkg/platform: remove deprecated OSType constSebastiaan van Stijn2023-05-061-8/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This const was deprecated in 5c78cbd3be7b782c1cc81825adf2a2595317a929, which is part of the v24.0.0 release, so we can remove it from master. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | Merge pull request #45530 from rumpl/fix-empty-auth-pullSebastiaan van Stijn2023-05-121-4/+1
|\ \ \ \ \ | | | | | | | | | | | | c8d: The authorizer needs to be set even if AuthConfig is empty
| * | | | | c8d: The authorizer needs to be set even if AuthConfig is emptyDjordje Lukic2023-05-121-4/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Without the authorizer pulling will fail if the user is not logged-in Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
* | | | | Merge pull request #45473 from zhangguanzhang/master-commentStrAkihiro Suda2023-05-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [builder] make chownComment easy to read
| * | | | | make chownComment easy to readzhangguanzhang2023-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | | Merge pull request #45322 from laurazard/c8d-upstream-classic-builderTianon Gravi2023-05-1110-20/+615
|\ \ \ \ \ \ | | | | | | | | | | | | | | c8d: implement classic builder
| * | | | | | c8d/builder: implement cacheLaura Brehm2023-05-113-44/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Laura Brehm <laurabrehm@hey.com>
| * | | | | | c8d: implement classic builderLaura Brehm2023-05-1110-16/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Djordje Lukic <djordje.lukic@docker.com> Signed-off-by: Laura Brehm <laurabrehm@hey.com>
* | | | | | | Merge pull request #45519 from crazy-max/bin-imageSebastiaan van Stijn2023-05-112-0/+100
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | bin-image bake target
| * | | | | | | ci: bin-image workflowCrazyMax2023-05-112-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This workflow will just build the bin-image bake target. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
| * | | | | | | bin-image bake targetKevin Alvarez2023-05-111-0/+24
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to build a non-runnable image that contains bundles. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
* | | | | | | Merge pull request #45513 from thaJeztah/client_remove_uses_of_IsErrNotFoundSebastiaan van Stijn2023-05-11102-424/+305
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | client: make IsErrNotFound an alias for errdefs.IsNotFound, clean-up assertions on tests
| * | | | | | | testutil: replace uses of client.IsErrNotFoundSebastiaan van Stijn2023-05-102-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client no longer returns the old error-type, so we can use errdefs instead. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | integration: update error-assertions in testsSebastiaan van Stijn2023-05-103-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use is.ErrorType - replace uses of client.IsErrNotFound for errdefs.IsNotFound, as the client no longer returns the old error-type. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | integration-cli: update error-assertions in testsSebastiaan van Stijn2023-05-103-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use is.ErrorType - replace uses of client.IsErrNotFound for errdefs.IsNotFound, as the client no longer returns the old error-type. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | client: update error-assertions in testsSebastiaan van Stijn2023-05-1093-392/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use is.ErrorType - replace uses of client.IsErrNotFound for errdefs.IsNotFound, as the client no longer returns the old error-type. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | client: make IsErrNotFound an alias for errdefs.IsNotFoundSebastiaan van Stijn2023-05-101-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of the client will return the old error-types, so there's no need to keep the compatibility code. We can consider deprecating this function in favor of the errdefs equivalent this. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | Merge pull request #45517 from vvoland/c8d-authconfig-defaultSebastiaan van Stijn2023-05-111-9/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | c8d: Better handling of partially filled `AuthConfig`
| * | | | | | | | c8d: Don't create authorizer for empty AuthConfigPaweł Gronowski2023-05-111-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
| * | | | | | | | c8d/authorizer: Default to docker.ioPaweł Gronowski2023-05-111-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `ServerAddress` in the `AuthConfig` provided by the client is empty, default to the default registry (registry-1.docker.io). This makes the behaviour the same as with the containerd image store integration disabled. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
* | | | | | | | Merge pull request #45516 from thaJeztah/vendor_distribution_v2.8.2-beta.2Sebastiaan van Stijn2023-05-1115-62/+98
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | vendor: github.com/docker/distribution v2.8.2-beta.2
| * | | | | | | vendor: github.com/docker/distribution v2.8.2Sebastiaan van Stijn2023-05-1115-62/+98
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI - Dockerfile: fix filenames of artifacts Bugfixes - Fix panic in inmemory driver - Add code to handle pagination of parts. Fixes max layer size of 10GB bug - Parse http forbidden as denied - Revert "registry/client: set Accept: identity header when getting layers Runtime - Update to go1.19.9 - Dockerfile: update xx to v1.2.1 ([#3907](https://github.com/distribution/distribution/pull/3907)) Security - Fix [CVE-2022-28391](https://www.cve.org/CVERecord?id=CVE-2022-28391) by bumping alpine from 3.14 to 3.16 - Fix [CVE-2023-2253](https://www.cve.org/CVERecord?id=CVE-2023-2253) runaway allocation on /v2/_catalog [`521ea3d9`](https://github.com/distribution/distribution/commit/521ea3d973cb0c7089ebbcdd4ccadc34be941f54) full diff: https://github.com/docker/distribution/compare/v2.8.1...v2.8.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> bump to release/2.8 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | Merge pull request #45304 from crazy-max/buildkit-version-buildinfoBrian Goff2023-05-1014-4/+1780
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set BuildKit version using buildinfo
| * | | | | | | hack: enable Go modules when building dockerd and docker-proxyKevin Alvarez2023-04-252-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround to have buildinfo with deps embedded in the binary. We need to create a go.mod file before building with -modfile=vendor.mod, otherwise it fails with: "-modfile cannot be used to set the module root directory." Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
| * | | | | | | Set BuildKit version using buildinfoCrazyMax2023-04-2512-2/+1770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets BuildKit version from the build information embedded in running binary so we are aligned with the expected vendoring. We iterate over all dependencies and find the BuildKit one and set the right version. We also check if the module is replaced and use it this case. There is also additional checks if a pseudo version is detected. See comments in code for more info. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
* | | | | | | | Merge pull request #45508 from laurazard/c8d-dangling-image-historySebastiaan van Stijn2023-05-101-3/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | c8d: image history – handle dangling images
| * | | | | | | c8d: fix image history for dangling imagesLaura Brehm2023-05-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Laura Brehm <laurabrehm@hey.com>
* | | | | | | | Merge pull request #45427 from laurazard/c8d-fix-incomplete-imagesSebastiaan van Stijn2023-05-102-14/+334
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | c8d: implement missing image delete logic