-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[27.1 backport] Add OomScoreAdj to "docker service create" and "docker stack" #5274
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: plaurent <[email protected]> (cherry picked from commit aa2c2cd) Signed-off-by: Sebastiaan van Stijn <[email protected]>
3 tasks
thaJeztah
changed the title
[27.1 backport] Allow for OomScoreAdj
[27.1 backport] Add OomScoreAdj to "docker service create" and "docker stack"
Jul 19, 2024
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 27.0 #5274 +/- ##
==========================================
+ Coverage 61.05% 61.50% +0.44%
==========================================
Files 296 299 +3
Lines 20848 20864 +16
==========================================
+ Hits 12729 12832 +103
+ Misses 7202 7116 -86
+ Partials 917 916 -1 |
krissetto
approved these changes
Jul 19, 2024
renovate bot
added a commit
to earthly/dind
that referenced
this pull request
Jul 22, 2024
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/docker](https://togithub.com/docker/docker) | minor | `27.0.3` -> `27.1.0` | --- ### Release Notes <details> <summary>docker/docker (docker/docker)</summary> ### [`v27.1.0`](https://togithub.com/moby/moby/releases/tag/v27.1.0) [Compare Source](https://togithub.com/docker/docker/compare/v27.0.3...v27.1.0) #### 27.1.0 For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones: - [docker/cli, 27.1.0 milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A27.1.0) - [moby/moby, 27.1.0 milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A27.1.0) - Deprecated and removed features, see [Deprecated Features](https://togithub.com/docker/cli/blob/v27.1.0/docs/deprecated.md). - Changes to the Engine API, see [API version history](https://togithub.com/moby/moby/blob/v27.1.0/docs/api/version-history.md). ##### Bug fixes and enhancements - rootless: add `Requires=dbus.socket` to prevent errors when starting the daemon on a cgroup v2 host with systemd [moby/moby#48141](https://togithub.com/moby/moby/pull/48141) - containerd integration: `image tag` event is now properly emitted when building images with Buildkit [moby/moby#48182](https://togithub.com/moby/moby/pull/48182) - cli: add OOMScoreAdj to docker service create and docker stack [docker/cli#5274](https://togithub.com/docker/cli/pull/5274) - cli: add support for `DOCKER_CUSTOM_HEADERS` env-var (experimental) [docker/cli#5271](https://togithub.com/docker/cli/pull/5271) - cli: containerd-integration: Fix `docker push` defaulting the `--platform` flag to a value of `DOCKER_DEFAULT_PLATFORM` environment variable on unsupported API versions [docker/cli#5248](https://togithub.com/docker/cli/pull/5248) - cli: fix: ctx cancellation on login prompt [docker/cli#5260](https://togithub.com/docker/cli/pull/5260) - cli: fix: wait for the container to exit before closing the stream when sending a termination request to the CLI while attached to a container [docker/cli#5250](https://togithub.com/docker/cli/pull/5250) ##### Deprecated - the pkg/rootless/specconv package is deprecated, an will be removed in the next release [moby/moby#48185](https://togithub.com/moby/moby/pull/48185) - the pkg/containerfs package is deprecated, an will be removed in the next release [moby/moby#48185](https://togithub.com/moby/moby/pull/48185) - the pkg/directory package is deprecated, an will be removed in the next release [moby/moby#48185](https://togithub.com/moby/moby/pull/48185) - api/types/system: remove deprecated Info.ExecutionDriver [moby/moby#48184](https://togithub.com/moby/moby/pull/48184) ##### Packaging updates - Update Buildx to [v0.16.1](https://togithub.com/docker/buildx/releases/tag/v0.16.1). [moby/docker-ce-packaging#1039](https://togithub.com/docker/docker-ce-packaging/pull/1039) - Update Compose to [v2.29.0](https://togithub.com/docker/compose/releases/tag/v2.29.0). [moby/docker-ce-packaging#1038](https://togithub.com/docker/docker-ce-packaging/pull/1038) - Update Containerd (static binaries only) to [v1.7.20](https://togithub.com/containerd/containerd/releases/tag/v1.7.20). [moby/moby#48191](https://togithub.com/moby/moby/pull/48191) - Update BuildKit to [v0.15.0](https://togithub.com/moby/buildkit/releases/tag/v0.15.0). [moby/moby#48028](48175://togithub.com/moby/moby/pull/48175) - Update Go runtime to 1.21.12, which contains security fixes for [CVE-2024-24791](https://togithub.com/advisories/GHSA-hw49-2p59-3mhj) [moby/moby#48120](48175://togithub.com/moby/moby/pull/48120) **Full Changelog**: moby/moby@v27.0.3...v27.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/earthly/dind). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MzguMCIsInVwZGF0ZWRJblZlciI6IjM3LjQzOC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot
added a commit
to earthly/dind
that referenced
this pull request
Jul 22, 2024
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/docker](https://togithub.com/docker/docker) | minor | `27.0.3` -> `27.1.0` | --- ### Release Notes <details> <summary>docker/docker (docker/docker)</summary> ### [`v27.1.0`](https://togithub.com/moby/moby/releases/tag/v27.1.0) [Compare Source](https://togithub.com/docker/docker/compare/v27.0.3...v27.1.0) #### 27.1.0 For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones: - [docker/cli, 27.1.0 milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A27.1.0) - [moby/moby, 27.1.0 milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A27.1.0) - Deprecated and removed features, see [Deprecated Features](https://togithub.com/docker/cli/blob/v27.1.0/docs/deprecated.md). - Changes to the Engine API, see [API version history](https://togithub.com/moby/moby/blob/v27.1.0/docs/api/version-history.md). ##### Bug fixes and enhancements - rootless: add `Requires=dbus.socket` to prevent errors when starting the daemon on a cgroup v2 host with systemd [moby/moby#48141](https://togithub.com/moby/moby/pull/48141) - containerd integration: `image tag` event is now properly emitted when building images with Buildkit [moby/moby#48182](https://togithub.com/moby/moby/pull/48182) - cli: add OOMScoreAdj to docker service create and docker stack [docker/cli#5274](https://togithub.com/docker/cli/pull/5274) - cli: add support for `DOCKER_CUSTOM_HEADERS` env-var (experimental) [docker/cli#5271](https://togithub.com/docker/cli/pull/5271) - cli: containerd-integration: Fix `docker push` defaulting the `--platform` flag to a value of `DOCKER_DEFAULT_PLATFORM` environment variable on unsupported API versions [docker/cli#5248](https://togithub.com/docker/cli/pull/5248) - cli: fix: ctx cancellation on login prompt [docker/cli#5260](https://togithub.com/docker/cli/pull/5260) - cli: fix: wait for the container to exit before closing the stream when sending a termination request to the CLI while attached to a container [docker/cli#5250](https://togithub.com/docker/cli/pull/5250) ##### Deprecated - the pkg/rootless/specconv package is deprecated, an will be removed in the next release [moby/moby#48185](https://togithub.com/moby/moby/pull/48185) - the pkg/containerfs package is deprecated, an will be removed in the next release [moby/moby#48185](https://togithub.com/moby/moby/pull/48185) - the pkg/directory package is deprecated, an will be removed in the next release [moby/moby#48185](https://togithub.com/moby/moby/pull/48185) - api/types/system: remove deprecated Info.ExecutionDriver [moby/moby#48184](https://togithub.com/moby/moby/pull/48184) ##### Packaging updates - Update Buildx to [v0.16.1](https://togithub.com/docker/buildx/releases/tag/v0.16.1). [moby/docker-ce-packaging#1039](https://togithub.com/docker/docker-ce-packaging/pull/1039) - Update Compose to [v2.29.0](https://togithub.com/docker/compose/releases/tag/v2.29.0). [moby/docker-ce-packaging#1038](https://togithub.com/docker/docker-ce-packaging/pull/1038) - Update Containerd (static binaries only) to [v1.7.20](https://togithub.com/containerd/containerd/releases/tag/v1.7.20). [moby/moby#48191](https://togithub.com/moby/moby/pull/48191) - Update BuildKit to [v0.15.0](https://togithub.com/moby/buildkit/releases/tag/v0.15.0). [moby/moby#48175](https://togithub.com/moby/moby/pull/48175) - Update Go runtime to 1.21.12, which contains security fixes for [CVE-2024-24791](https://togithub.com/advisories/GHSA-hw49-2p59-3mhj) [moby/moby#48120](48175://togithub.com/moby/moby/pull/48120) **Full Changelog**: moby/moby@v27.0.3...v27.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/earthly/dind). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MzguMCIsInVwZGF0ZWRJblZlciI6IjM3LjQzOC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
I added oom-score-adj flag to docker service create and docker service update
- How I did it
By modifying container service to accept the option as well as adding a flag to the CLI
- How to test it
Compile this PR and copy the CLI binary to a running moby dev shell using moby/moby#47950
- Description for the changelog