Allow for OomScoreAdj

Signed-off-by: plaurent <[email protected]>
docker · Jun 27, 2024 · ef69fb9 · ef69fb9
1 parent f738c98
commit ef69fb9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md
@@ -45,6 +45,7 @@ Create a new service
 | `--name`                                            | `string`          |              | Service name                                                                                        |
 | [`--network`](#network)                             | `network`         |              | Network attachments                                                                                 |
 | `--no-healthcheck`                                  |                   |              | Disable any container-specified HEALTHCHECK                                                         |
+| `--oom-score-adj`                                   | `int64`           | `0`          | oom score adjustment (-1000 to 1000)                                                                |
 | `--no-resolve-image`                                |                   |              | Do not query the registry to resolve image digest and supported platforms                           |
 | [`--placement-pref`](#placement-pref)               | `pref`            |              | Add a placement preference                                                                          |
 | [`-p`](#publish), [`--publish`](#publish)           | `port`            |              | Publish a port as a node port                                                                       |

diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md
@@ -59,6 +59,7 @@ Update a service
 | `--network-rm`                                | `list`            |         | Remove a network                                                                                    |
 | `--no-healthcheck`                            |                   |         | Disable any container-specified HEALTHCHECK                                                         |
 | `--no-resolve-image`                          |                   |         | Do not query the registry to resolve image digest and supported platforms                           |
+| `--oom-score-adj`                             | `int64`           | `0`     | oom score adjustment (-1000 to 1000)                                                                |
 | `--placement-pref-add`                        | `pref`            |         | Add a placement preference                                                                          |
 | `--placement-pref-rm`                         | `pref`            |         | Remove a placement preference                                                                       |
 | [`--publish-add`](#publish-add)               | `port`            |         | Add or update a published port                                                                      |

diff --git a/opts/opts.go b/opts/opts.go
@@ -528,9 +528,8 @@ func (o *OomScoreAdj) String() string {
 }
 
 func (o *OomScoreAdj) Set(value string) error {
-
 	var conv int64
-	conv, _ = strconv.ParseInt(value, 10, 64)
+	conv, err := strconv.ParseInt(value, 10, 64)
 	*o = OomScoreAdj(conv)
-	return nil
+	return err
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -53,7 +53,7 @@ github.com/docker/distribution/registry/client/transport
 github.com/docker/distribution/registry/storage/cache
 github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
-github.com/docker/docker v27.0.1-rc.1.0.20240621131212-ff1e2c0de72a+incompatible
+# github.com/docker/docker v27.0.1-rc.1.0.20240621131212-ff1e2c0de72a+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types