Skip to content

Updated taskworkflow.go: fixes in socket name and readme. #399

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

Merged

Conversation

ustiugov
Copy link
Contributor

@ustiugov ustiugov commented Mar 2, 2020

*Issue #387 *

Description of changes:

Socket name was aligned with the quickstart guidelines. Removed the -mask argument from the readme as it is not supported anymore. Specified that -ip argument requires CIDR and not just an IP address.

Signed-off-by: Dmitrii Ustiugov [email protected]

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@kzys
Copy link
Contributor

kzys commented Mar 2, 2020

I think our Docker image is still running firecracker-containerd on /run/containerd/containerd.sock and that's why the test is failing.

@ustiugov
Copy link
Contributor Author

ustiugov commented Mar 6, 2020

@kzys shall we change tools/docker/config.toml to contain:

imports ["/etc/containerd/snapshotter/*.toml"]
[grpc]
  address = "/run/firecracker-containerd/containerd.sock"

and then add --config option to tools/docker/entrypoint.sh

would it be the right way?

@kzys
Copy link
Contributor

kzys commented Mar 7, 2020

@ustiugov That's the right way, but you don't need to pass --config since our Dockerfile is copying the file to /etc/containerd/config.toml, where is containerd's default.

COPY tools/docker/config.toml /etc/containerd/config.toml

@ustiugov ustiugov force-pushed the taskworkflow_fixes branch 3 times, most recently from 8e7adf5 to 7e6f53d Compare March 21, 2020 12:26
Socket name was aligned with the quickstart guidelines (in integration tests as well).
Removed the mask argument from the readme as it is not supported anymore.

Signed-off-by: Dmitrii Ustiugov <[email protected]>
@ustiugov ustiugov force-pushed the taskworkflow_fixes branch from 7e6f53d to 4b3f8a7 Compare March 21, 2020 13:40
@ustiugov
Copy link
Contributor Author

@kzys feedback applied, tests pass. Could you please check?

Copy link
Contributor

@kzys kzys left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks again for the fix.

@kzys kzys merged commit 40afe03 into firecracker-microvm:master Mar 23, 2020
fangn2 pushed a commit to fangn2/firecracker-containerd that referenced this pull request Mar 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants