-
Notifications
You must be signed in to change notification settings - Fork 361
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
Make DockerRemoteApi plugin configuration cache compatible for Gradle 8.1+ #1193
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e93d41b
Adding @Ignore to failing tests before starting on PR changes
Jocce-Nilsson 97e759e
Add flag to set for integration tests
Jocce-Nilsson 8d2ab91
Add possibility to use specific Gradle version in test
Jocce-Nilsson f8effeb
Add functional test case for DockerRemoteApi plugin
Jocce-Nilsson 44e4247
Add ValueSource for default URl resolution
Jocce-Nilsson c03003f
Update src/functTest/groovy/com/bmuschko/gradle/docker/AbstractFuncti…
Jocce-Nilsson 7972531
Revert "Adding @Ignore to failing tests before starting on PR changes"
Jocce-Nilsson d91f2c5
Add @Ignore on test not capable to run on windows
Jocce-Nilsson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
52 changes: 52 additions & 0 deletions
52
src/main/java/com/bmuschko/gradle/docker/internal/DefaultDockerUrlValueSource.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
package com.bmuschko.gradle.docker.internal; | ||
|
||
import org.gradle.api.logging.Logger; | ||
import org.gradle.api.logging.Logging; | ||
import org.gradle.api.provider.ValueSource; | ||
import org.gradle.api.provider.ValueSourceParameters; | ||
|
||
import javax.annotation.Nullable; | ||
import java.io.File; | ||
|
||
public abstract class DefaultDockerUrlValueSource implements ValueSource<String, ValueSourceParameters.None> { | ||
Jocce-Nilsson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
private static final Logger logger = Logging.getLogger(DefaultDockerUrlValueSource.class); | ||
|
||
@Override | ||
public String obtain() { | ||
String dockerUrl = getEnv("DOCKER_HOST"); | ||
if (dockerUrl == null) { | ||
if (OsUtils.isWindows()) { | ||
if (isFileExists("\\\\.\\pipe\\docker_engine")) { | ||
dockerUrl = "npipe:////./pipe/docker_engine"; | ||
} | ||
} else { | ||
//Added for possibility to run integration tests, also makes it possible to override use of /var/run/ | ||
boolean skipVarRun = Boolean.valueOf(System.getProperty("com.bmuschko.gradle.docker.internal.DefaultDockerUrlValueSource.skipCheckOfVarRun", "false")); | ||
// macOS or Linux | ||
if (isFileExists("/var/run/docker.sock") && !skipVarRun) { | ||
dockerUrl = "unix:///var/run/docker.sock"; | ||
} else if (isFileExists(System.getProperty("user.home") + "/.docker/run/docker.sock")) { | ||
dockerUrl = "unix://" + System.getProperty("user.home") + "/.docker/run/docker.sock"; | ||
} | ||
} | ||
|
||
Jocce-Nilsson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if (dockerUrl == null) { | ||
dockerUrl = "tcp://127.0.0.1:2375"; | ||
} | ||
} | ||
|
||
logger.info("Default docker.url set to " + dockerUrl); | ||
return dockerUrl; | ||
} | ||
|
||
@Nullable | ||
String getEnv(String name) { | ||
return System.getenv(name); | ||
} | ||
|
||
boolean isFileExists(String path) { | ||
return new File(path).exists(); | ||
} | ||
} |
This file contains 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
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
auto formatting, is this OK to remove @bmuschko?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's fine. Seem like a tab or tabs ended up here.