Collection of changes driven by use in gradle-docker and on Windows#15
Merged
marcuslinke merged 4 commits intodocker-java:masterfrom Jul 4, 2014
Merged
Collection of changes driven by use in gradle-docker and on Windows#15marcuslinke merged 4 commits intodocker-java:masterfrom
marcuslinke merged 4 commits intodocker-java:masterfrom
Conversation
sfitts
commented
Jul 4, 2014
sfitts
commented
- Use .gitattributes to control line endings for the entire repository as suggested by GitHub (controlling on a per-client basis leads to too much churn). This was main driven by a need to keep the *.sh files with Linux line endings so that they would work in the tests (otherwise Linux doesn't know how to run them).
- Changed the default port to match that used by the current version of Docker (the readme says this is the port used, so I'm guessing this was just an oversight).
- Added a toString() method to each command so that they can be printed in a form similar to that of the docker client command line. This is handy when tracing the execution of commands (such as during a gradle build with --info).
- Attempted to address an issue relating to the logging of binary request/response payloads (such as the tar sent on a build). On both Windows and OSX this causes the console window to freeze. There was a commit in the old repository to address this by completely disabling logging. The approach here is only to skip logging of requests with content types that are known to be problematic.
- A few test tweaks -- one which catches if there is a major issue creating a new image and another which attempt to exercise the new toString code (without going to the trouble of verifying every combination).
added 4 commits
July 3, 2014 16:08
- Change the default Docker port to 2375 to match current Docker version. - Add toString() to all commands which prints out a form similar to the corresponding Docker command line. Useful in tracing. - Create client logging filter variant which allows us to avoid logging requests whose content type is likely to cause issues for both the Windows and OSX consoles. This is an adaptation of a change from a while back (alexec@887a112) which seems to have be lost in the move.
Revert API version which was by accident Fix bug in logging filter Add extra check to test to avoid downstream issues
This uses the recommended strategy to normalize line endings for mixed Windows/*nix development. We also make sure that the shell scripts used for testing have Unix line endings on all platforms so they will function properly.
Author
There was a problem hiding this comment.
These whole file replacements are due to the .gitattributes introduction. Turns out that these files were being stored in a non-normalized form (which can happen without the use of .gitattributes).
Collaborator
|
Thanks for contributing. Didn't even know about this .gitattributes until now... |
Author
|
No problem, thanks for keeping this active. |
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
3 participants
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.