<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/docker.git/libcontainerd, branch master</title>
<subtitle>github.com: dotcloud/docker.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/'/>
<entry>
<title>Merge pull request #45484 from thaJeztah/remove_deprecated_stubs</title>
<updated>2023-05-12T13:03:26+00:00</updated>
<author>
<name>Sebastiaan van Stijn</name>
<email>thaJeztah@users.noreply.github.com</email>
</author>
<published>2023-05-12T13:03:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=bafcfdf8c5ab70b7c01cfa940251d518317ab413'/>
<id>bafcfdf8c5ab70b7c01cfa940251d518317ab413</id>
<content type='text'>
remove deprecated types, fields, and functions</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
remove deprecated types, fields, and functions</pre>
</div>
</content>
</entry>
<entry>
<title>fixing consistent aliases for OCI spec imports</title>
<updated>2023-05-08T09:57:52+00:00</updated>
<author>
<name>Jeyanthinath Muthuram</name>
<email>jeyanthinath10@gmail.com</email>
</author>
<published>2023-05-08T09:57:52+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=307b09e7eb14e48a66752b036fb2a2eb53fa599c'/>
<id>307b09e7eb14e48a66752b036fb2a2eb53fa599c</id>
<content type='text'>
Signed-off-by: Jeyanthinath Muthuram &lt;jeyanthinath10@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Jeyanthinath Muthuram &lt;jeyanthinath10@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>daemon: remove handling for deprecated "oom-score-adjust", and produce error</title>
<updated>2023-05-06T14:36:17+00:00</updated>
<author>
<name>Sebastiaan van Stijn</name>
<email>github@gone.nl</email>
</author>
<published>2023-05-06T13:04:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=fb96b94ed00aa4f200dc03642bc46d4289eb6860'/>
<id>fb96b94ed00aa4f200dc03642bc46d4289eb6860</id>
<content type='text'>
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 &lt;github@gone.nl&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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 &lt;github@gone.nl&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #45315 from thaJeztah/deprecate_oom_score_adjust</title>
<updated>2023-04-13T22:06:58+00:00</updated>
<author>
<name>Sebastiaan van Stijn</name>
<email>thaJeztah@users.noreply.github.com</email>
</author>
<published>2023-04-13T22:06:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=61656464d86a033c4b2b19b053d93c2f0035389f'/>
<id>61656464d86a033c4b2b19b053d93c2f0035389f</id>
<content type='text'>
daemon: deprecate --oom-score-adjust for the daemon</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
daemon: deprecate --oom-score-adjust for the daemon</pre>
</div>
</content>
</entry>
<entry>
<title>daemon: deprecate --oom-score-adjust for the daemon</title>
<updated>2023-04-12T22:02:39+00:00</updated>
<author>
<name>Sebastiaan van Stijn</name>
<email>github@gone.nl</email>
</author>
<published>2023-04-12T21:37:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=5a922dc162bbe0a03450165da4e6aceca55073d4'/>
<id>5a922dc162bbe0a03450165da4e6aceca55073d4</id>
<content type='text'>
The `oom-score-adjust` option was added in a894aec8d81de5484152a76d76b80809df9edd71,
to prevent the daemon from being OOM-killed before other processes. This
option was mostly added as a "convenience", as running the daemon as a
systemd unit was not yet common.

Having the daemon set its own limits is not best-practice, and something
better handled by the process-manager starting the daemon.

Commit cf7a5be0f2ee8bb4a3f7961682e13b89bc625299 fixed this option to allow
disabling it, and 2b8e68ef06ca3daf2b0e17e51ba72999773b6270 removed the default
score adjust.

This patch deprecates the option altogether, recommending users to set these
limits through the process manager used, such as the "OOMScoreAdjust" option
in systemd units.

With this patch:

    dockerd --oom-score-adjust=-500 --validate
    Flag --oom-score-adjust has been deprecated, and will be removed in the next release.
    configuration OK

    echo '{"oom-score-adjust":-500}' &gt; /etc/docker/daemon.json
    dockerd
    INFO[2023-04-12T21:34:51.133389627Z] Starting up
    INFO[2023-04-12T21:34:51.135607544Z] containerd not running, starting managed containerd
    WARN[2023-04-12T21:34:51.135629086Z] DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" option will be removed in the next release.

    docker info
    Client:
      Context:    default
      Debug Mode: false
    ...
    DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" option will be removed in the next release

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The `oom-score-adjust` option was added in a894aec8d81de5484152a76d76b80809df9edd71,
to prevent the daemon from being OOM-killed before other processes. This
option was mostly added as a "convenience", as running the daemon as a
systemd unit was not yet common.

Having the daemon set its own limits is not best-practice, and something
better handled by the process-manager starting the daemon.

Commit cf7a5be0f2ee8bb4a3f7961682e13b89bc625299 fixed this option to allow
disabling it, and 2b8e68ef06ca3daf2b0e17e51ba72999773b6270 removed the default
score adjust.

This patch deprecates the option altogether, recommending users to set these
limits through the process manager used, such as the "OOMScoreAdjust" option
in systemd units.

With this patch:

    dockerd --oom-score-adjust=-500 --validate
    Flag --oom-score-adjust has been deprecated, and will be removed in the next release.
    configuration OK

    echo '{"oom-score-adjust":-500}' &gt; /etc/docker/daemon.json
    dockerd
    INFO[2023-04-12T21:34:51.133389627Z] Starting up
    INFO[2023-04-12T21:34:51.135607544Z] containerd not running, starting managed containerd
    WARN[2023-04-12T21:34:51.135629086Z] DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" option will be removed in the next release.

    docker info
    Client:
      Context:    default
      Debug Mode: false
    ...
    DEPRECATED: The "oom-score-adjust" config parameter and the dockerd "--oom-score-adjust" option will be removed in the next release

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>use consistent alias for containerd's errdefs package</title>
<updated>2023-04-08T17:30:33+00:00</updated>
<author>
<name>Sebastiaan van Stijn</name>
<email>github@gone.nl</email>
</author>
<published>2023-04-08T17:30:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=81e62af94ac59cf56aa6f988e04f5238e0f69ad1'/>
<id>81e62af94ac59cf56aa6f988e04f5238e0f69ad1</id>
<content type='text'>
The signatures of functions in containerd's errdefs packages are very
similar to those in our own, and it's easy to accidentally use the wrong
package.

This patch uses a consistent alias for all occurrences of this import.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The signatures of functions in containerd's errdefs packages are very
similar to those in our own, and it's easy to accidentally use the wrong
package.

This patch uses a consistent alias for all occurrences of this import.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>libcontainerd: close stdin sync if possible</title>
<updated>2023-04-03T19:25:16+00:00</updated>
<author>
<name>Cory Snider</name>
<email>csnider@mirantis.com</email>
</author>
<published>2023-04-03T19:00:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=36935bd869ec5df59ca432221b7e0dc652cf3a3c'/>
<id>36935bd869ec5df59ca432221b7e0dc652cf3a3c</id>
<content type='text'>
Closing stdin of a container or exec (a.k.a.: task or process) has been
somewhat broken ever since support for ContainerD 1.0 was introduced
back in Docker v17.11: the error returned from the CloseIO() call was
effectively ignored due to it being assigned to a local variable which
shadowed the intended variable. Serendipitously, that oversight
prevented a data race. In my recent refactor of libcontainerd, I
corrected the variable shadowing issue and introduced the aforementioned
data race in the process.

Avoid deadlocking when closing stdin without swallowing errors or
introducing data races by calling CloseIO() synchronously if the process
handle is available, falling back to an asynchronous close-and-log
strategy otherwise. This solution is inelegant and complex, but looks to
be the best that could be done without changing the libcontainerd API.

Signed-off-by: Cory Snider &lt;csnider@mirantis.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closing stdin of a container or exec (a.k.a.: task or process) has been
somewhat broken ever since support for ContainerD 1.0 was introduced
back in Docker v17.11: the error returned from the CloseIO() call was
effectively ignored due to it being assigned to a local variable which
shadowed the intended variable. Serendipitously, that oversight
prevented a data race. In my recent refactor of libcontainerd, I
corrected the variable shadowing issue and introduced the aforementioned
data race in the process.

Avoid deadlocking when closing stdin without swallowing errors or
introducing data races by calling CloseIO() synchronously if the process
handle is available, falling back to an asynchronous close-and-log
strategy otherwise. This solution is inelegant and complex, but looks to
be the best that could be done without changing the libcontainerd API.

Signed-off-by: Cory Snider &lt;csnider@mirantis.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>vendor: github.com/containerd/cgroups/v3 v3.0.1</title>
<updated>2023-03-08T11:15:17+00:00</updated>
<author>
<name>Akihiro Suda</name>
<email>akihiro.suda.cz@hco.ntt.co.jp</email>
</author>
<published>2023-01-30T14:43:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=e807ae4f2e15583ee886cbb1b5274119809b25fd'/>
<id>e807ae4f2e15583ee886cbb1b5274119809b25fd</id>
<content type='text'>
Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>libcontainerd: Upgrade to typeurl/v2</title>
<updated>2023-03-08T10:26:32+00:00</updated>
<author>
<name>Paweł Gronowski</name>
<email>pawel.gronowski@docker.com</email>
</author>
<published>2023-03-01T16:39:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=a8f5c524a09881e0fca5f1612c501c5de500cb73'/>
<id>a8f5c524a09881e0fca5f1612c501c5de500cb73</id>
<content type='text'>
In preparation for containerd v1.7 which migrates off gogo/protobuf
and changes the protobuf Any type to one that's not supported by our
vendored version of typeurl.

This fixes a compile error on usages of `typeurl.UnmarshalAny` when
upgrading to containerd v1.7.

Signed-off-by: Paweł Gronowski &lt;pawel.gronowski@docker.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
In preparation for containerd v1.7 which migrates off gogo/protobuf
and changes the protobuf Any type to one that's not supported by our
vendored version of typeurl.

This fixes a compile error on usages of `typeurl.UnmarshalAny` when
upgrading to containerd v1.7.

Signed-off-by: Paweł Gronowski &lt;pawel.gronowski@docker.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #45032 from corhere/shim-opts</title>
<updated>2023-03-02T20:45:05+00:00</updated>
<author>
<name>Sebastiaan van Stijn</name>
<email>thaJeztah@users.noreply.github.com</email>
</author>
<published>2023-03-02T20:45:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/docker.git/commit/?id=11261594d89a46c71f6427299199b0f975a5c17f'/>
<id>11261594d89a46c71f6427299199b0f975a5c17f</id>
<content type='text'>
daemon: allow shimv2 runtimes to be configured</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
daemon: allow shimv2 runtimes to be configured</pre>
</div>
</content>
</entry>
</feed>
