Fixes and improvements#2947
Merged
Merged
Conversation
Signed-off-by: Leonard Kinday <leonard@kinday.ru>
Signed-off-by: Leonard Kinday <leonard@kinday.ru>
Signed-off-by: Leonard Kinday <leonard@kinday.ru>
Signed-off-by: Leonard Kinday <leonard@kinday.ru>
kinday
commented
Feb 2, 2022
Comment on lines
+383
to
+384
| decode=True | ||
| ): |
Contributor
Author
There was a problem hiding this comment.
This should probably look like this according to other places:
Suggested change
| decode=True | |
| ): | |
| decode=True): |
kinday
commented
Feb 2, 2022
Comment on lines
+259
to
+262
| client.api.create_host_config(port_bindings={1111: ( | ||
| '127.0.0.1', | ||
| 4567 | ||
| )}) |
Contributor
Author
There was a problem hiding this comment.
This should probably look like this according to other places:
Suggested change
| client.api.create_host_config(port_bindings={1111: ( | |
| '127.0.0.1', | |
| 4567 | |
| )}) | |
| client.api.create_host_config( | |
| port_bindings={1111: ('127.0.0.1', 4567)}) |
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
Contributor
|
Thank you for the fixes and improvements! I just brought this branch up to date. The integration test wait fix is much appreciated ✌️ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes various issues and introduces CI improvements. There are no functional changes, only stylistic and/or infrastructure fixes. Issues were encountered during work on other contribution when I attempted to run
make test.Fix flake8 errors (e1a203f)
make testwas failing due to several formatting issues, mostly line width. I have reformatted code in multiple places to makeflake8happy1.Fix integration tests race condition (89bce10)
Integration tests were crashing as they were starting before Docker-in-Docker container was ready to accept connections. This was reported in #996 and
sleepis not a viable fix as DinD startup time varies.I have updated
Makefile2 to runnetcatinbusyboximage. This solution is used instead of runningnetcaton host system for two reasons: the binary might not be present and container could be unreachable from host network3Run integration tests on CI (d28f522)
Integration test suite does not fully pass on macOS thus I have updated workflow to run them on CI. This could help people with compatibility issues and ensure that proposed changes are not breaking anything.
Update: I’ve noticed integration tests are being run on Jenkins. Maybe this one could be removed, but running them via GHA allows to get them executed before PR was created, i.e. in contributor’s repository and give early feedback.
Use existing DIND version (924e09a)
The
20.10.05tag is no longer available on Docker Hub. I have replaced it with20.10as this seems to be more resilient than specifying full tag.Footnotes
I am not sure if I formatted the code according to Python code style; please tell if it should it be indented/splitted differently. ↩
I took liberty to partially reformat
Makefileand replace shorthand flags with longhand ones for readability. I can either revert the changes, or apply the same style to whole file or keep things as is. Your call. ↩Could be observed on macOS as Docker is being run in virtual machine and the only way to access container is to bind ports to host network. ↩