Skip to content

Commit

Permalink
Revert "Add docker rootless support for macOS and desktop for Linux (#…
Browse files Browse the repository at this point in the history
…6907)" (#7015)

This reverts commit 0bf52a9.
  • Loading branch information
eddumelendez authored May 8, 2023
1 parent 730f689 commit 6ef107e
Showing 1 changed file with 3 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,8 @@ private Path resolveSocketPath() {
Path homePath = Paths.get(System.getProperty("user.home")).resolve(".docker").resolve("run");
return tryFolder(homePath)
.orElseGet(() -> {
Path dockerDesktopPath = Paths
.get(System.getProperty("user.home"))
.resolve(".docker")
.resolve("desktop");
return tryFolder(dockerDesktopPath)
.orElseGet(() -> {
Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
return tryFolder(implicitPath).orElse(null);
});
Path implicitPath = Paths.get("/run/user/" + LibC.INSTANCE.getuid());
return tryFolder(implicitPath).orElse(null);
});
});
}
Expand Down Expand Up @@ -86,11 +79,7 @@ public TransportConfig getTransportConfig() throws InvalidConfigurationException

@Override
protected boolean isApplicable() {
return (
(SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) &&
getSocketPath() != null &&
Files.exists(getSocketPath())
);
return SystemUtils.IS_OS_LINUX && getSocketPath() != null && Files.exists(getSocketPath());
}

@Override
Expand Down

0 comments on commit 6ef107e

Please sign in to comment.