Skip to content
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

Update sbin mount point to avoid conflict with newer Docker #2345

Merged
merged 1 commit into from
Jan 24, 2020

Conversation

fenxiong
Copy link
Contributor

@fenxiong fenxiong commented Jan 23, 2020

Summary

Newer version of Docker mounts tini to /sbin/init which conflicts our existing /sbin:/sbin mount. Updating the mount to /sbin:/host/sbin and adds /host/sbin to the PATH env (needed by the appmesh plugin to find the iptable binary) fixes the problem.
This accompanies aws/amazon-ecs-init#296.

Implementation details

Update the mount from /sbin:/sbin to /sbin:/host/sbin. Add /host/sbin to the PATH env of the agent.

Testing

The appmesh cni plugin needs this mount to be correct in order to find the iptables executable, so our existing appmesh functional test will be ensuring the changes don't break the plugin. I've manually ran the test on an instance with Docker 19.03.5 and verifies that the test fails without the changes, but passes with the changes.

New tests cover the changes: no

Description for the changelog

Update sbin mount point to avoid conflict with newer version of Docker.

Licensing

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

Newer version of Docker mounts tini to /sbin/init which conflicts our existing /sbin:/sbin mount. Updating the mount to /sbin:/host/sbin and adds /host/sbin to the PATH env (needed by the appmesh plugin to find the iptable binary) fixes the problem.
@petderek
Copy link
Contributor

Thanks for doing this. Did you test this change against an older version of init?

@fenxiong
Copy link
Contributor Author

Thanks for doing this. Did you test this change against an older version of init?

Yeah i launched the agent with existing version of init and ran the appmesh functional test and it passed. The old path /sbin is already included in the PATH env, just that it's after /host/sbin.

@petderek
Copy link
Contributor

I saw that but wanted to double check. Nice!!

@fenxiong fenxiong requested a review from a team January 23, 2020 22:22
@fenxiong fenxiong merged commit 0a5c60c into aws:dev Jan 24, 2020
@fenxiong fenxiong added this to the 1.36.2 milestone Feb 4, 2020
adityapahuja added a commit to alphagov/verify-infrastructure that referenced this pull request Mar 10, 2020
This change updates docker volume mount to use /host/sbin instead of /sbin. This change is needed to avoid conflict with newer Docker. Please see further details on the following link (aws/amazon-ecs-agent#2345).

Author: @adityapahuja
adityapahuja added a commit to alphagov/verify-infrastructure that referenced this pull request Mar 10, 2020
This change updates docker volume mount to use /host/sbin instead of /sbin. This change is needed to avoid conflict with newer Docker. Please see further details on the following link (aws/amazon-ecs-agent#2345).

Author: @adityapahuja
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.

3 participants