spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48965 from nosan

Browse Source 
* pr/48965:
  Ensure Windows Docker credential helper resolves correctly

Closes gh-48965
This commit is contained in:
Stéphane Nicoll
2026-01-27 08:23:30 +01:00
parent 32dfd3892d a4ed09e5d2
commit 78d8f96509
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelper.java
+2 -1
View File
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -78,7 +79,7 @@ class CredentialHelper {
if (Platform.isWindows()) {
processBuilder.command("cmd", "/c");
}
processBuilder.command(this.executable, action);
processBuilder.command().addAll(Arrays.asList(this.executable, action));
return processBuilder;
}
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelperTests.java
+14 -4
View File
@@ -38,10 +38,20 @@ class CredentialHelperTests {
@BeforeAll
static void setUp() throws Exception {
String executableName = "docker-credential-test" + ((Platform.isWindows()) ? ".bat" : ".sh");
String executable = new ClassPathResource(executableName, CredentialHelperTests.class).getFile()
.getAbsolutePath();
helper = new CredentialHelper(executable);
helper = new CredentialHelper(getExecutableName());
}
private static String getExecutableName() throws Exception {
if (Platform.isWindows()) {
String executablePath = geExecutableAbsolutePath("docker-credential-test.bat");
// cmd /c must resolve automatically .bat suffix
return executablePath.substring(0, executablePath.lastIndexOf(".bat"));
}
return geExecutableAbsolutePath("docker-credential-test.sh");
}
private static String geExecutableAbsolutePath(String executableName) throws Exception {
return new ClassPathResource(executableName, CredentialHelperTests.class).getFile().getAbsolutePath();
}
@Test