Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-42960
This commit is contained in:
Moritz Halbritter
2024-10-31 15:07:11 +01:00
parent 5b30e6fb9e 6470748d6d
commit 8f6aabc15b
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/ResolvedDockerHostTests.java
View File

@@ -39,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link ResolvedDockerHost}.
*
* @author Scott Frederick
* @author Moritz Halbritter
*/
class ResolvedDockerHostTests {
@@ -64,6 +65,16 @@ class ResolvedDockerHostTests {
assertThat(dockerHost.getCertificatePath()).isNull();
}
@Test
@EnabledOnOs(OS.WINDOWS)
void resolveWhenUsingDefaultContextReturnsWindowsDefault() {
this.environment.put("DOCKER_CONTEXT", "default");
ResolvedDockerHost dockerHost = ResolvedDockerHost.from(this.environment::get, null);
assertThat(dockerHost.getAddress()).isEqualTo("//./pipe/docker_engine");
assertThat(dockerHost.isSecure()).isFalse();
assertThat(dockerHost.getCertificatePath()).isNull();
}
@Test
@DisabledOnOs(OS.WINDOWS)
void resolveWhenDockerHostAddressIsNullReturnsLinuxDefault() throws Exception {
@@ -75,6 +86,16 @@ class ResolvedDockerHostTests {
assertThat(dockerHost.getCertificatePath()).isNull();
}
@Test
@DisabledOnOs(OS.WINDOWS)
void resolveWhenUsingDefaultContextReturnsLinuxDefault() {
this.environment.put("DOCKER_CONTEXT", "default");
ResolvedDockerHost dockerHost = ResolvedDockerHost.from(this.environment::get, null);
assertThat(dockerHost.getAddress()).isEqualTo("/var/run/docker.sock");
assertThat(dockerHost.isSecure()).isFalse();
assertThat(dockerHost.getCertificatePath()).isNull();
}
@Test
void resolveWhenDockerHostAddressIsLocalReturnsAddress(@TempDir Path tempDir) throws IOException {
String socketFilePath = Files.createTempFile(tempDir, "remote-transport", null).toAbsolutePath().toString();