Skip to content

hack: Add explicit containerd feature to daemon.json#48860

Merged
thaJeztah merged 1 commit intomoby:masterfrom
vvoland:hack-features-c8d
Nov 13, 2024
Merged

hack: Add explicit containerd feature to daemon.json#48860
thaJeztah merged 1 commit intomoby:masterfrom
vvoland:hack-features-c8d

Conversation

@vvoland
Copy link
Copy Markdown
Contributor

@vvoland vvoland commented Nov 13, 2024

Just a small quality of life enhancement if you run the dev container a lot for testing the containerd integration.

While it's still turned off by default, it's easier to just flip the false to true inside the devcontainer.

While it's still turned off by default, it's easier to just flip the
`false` to `true` inside the devcontainer.

Signed-off-by: Paweł Gronowski <[email protected]>
@vvoland vvoland added area/testing containerd-integration Issues and PRs related to containerd integration labels Nov 13, 2024
@vvoland vvoland added this to the 28.0.0 milestone Nov 13, 2024
@vvoland vvoland self-assigned this Nov 13, 2024
@vvoland vvoland requested a review from tianon as a code owner November 13, 2024 13:46
@thaJeztah
Copy link
Copy Markdown
Member

Perhaps we should also remove this "feature"; which currently requires me to explicitly override the storage-driver in various cases;

DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info -f '{{ .Driver }}' 2>&1))

Copy link
Copy Markdown
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit a2f7293 into moby:master Nov 13, 2024
Comment on lines +7 to 9
"features": {
"containerd-snapshotter": false
}
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DOH! Erm.. wondering if this makes things, erm, easier, or not. I was used to using the --feature option to enable/disable in my dev-shell, but forgot that this will now cause an error;

dockerd --feature containerd-snapshotter --debug
unable to configure the Docker daemon with file /etc/docker/daemon.json: the following directives are specified both as a flag and in the configuration file: features: (from flag: map[containerd-snapshotter:true], from file: map[containerd-snapshotter:false])

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right 🙈

To be honest, I got bit by this behavior multiple times with the --debug flag. Do you remember what was the reason we barf out instead of just making the CLI option take the precedence?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/testing containerd-integration Issues and PRs related to containerd integration status/4-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants