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

Fixes #724

Browse Source 
Record information in eclipse metadata for docker images build by IDE.
Just enough info is recored for a IDE built-image so we can avoid
parsing image metadata from the image itself (the image metadata
format is unstable and we do not have a usable api to get at it easily,
so trying to rely on it is fraught with problems).
This commit is contained in:
Kris De Volder
2022-06-24 15:31:20 -07:00
parent 078d1b1983
commit dc36d17298
6 changed files with 69 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/src/org/springframework/ide/eclipse/boot/dash/test/BootDashDockerTests.java
View File

@@ -22,7 +22,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.springframework.ide.eclipse.boot.test.BootProjectTestHarness.bootVersionAtLeast;
import static org.springframework.ide.eclipse.boot.test.BootProjectTestHarness.*;
import static org.springframework.ide.eclipse.boot.test.BootProjectTestHarness.withImportStrategy;
import static org.springframework.ide.eclipse.boot.test.BootProjectTestHarness.withStarters;
import static org.springsource.ide.eclipse.commons.tests.util.StsTestCase.assertContains;
@@ -128,7 +128,10 @@ public class BootDashDockerTests {
@Test
public void projectWithdDockerFile() throws Exception {
GenericRemoteBootDashModel<DockerClient, DockerTargetParams> model = createDockerTarget();
IProject project = projects.createBootWebProject("webby", bootVersionAtLeast("2.3.0"));
IProject project = projects.createBootWebProject("webby",
bootVersionAtLeast("2.3.0"),
withJavaVersion("11")
);
createExeFile(project, "sts-docker-build.sh",
"#!/bin/bash\n" +
"docker build -t webby ."
@@ -163,7 +166,10 @@ public class BootDashDockerTests {
@Test
public void missingBuildTagException() throws Exception {
GenericRemoteBootDashModel<DockerClient, DockerTargetParams> model = createDockerTarget();
IProject project = projects.createBootWebProject("webby", bootVersionAtLeast("2.3.0"));
IProject project = projects.createBootWebProject("webby",
bootVersionAtLeast("2.3.0"),
withJavaVersion("11")
);
createExeFile(project, "sts-docker-build.sh",
"#!/bin/bash\n" +
"# do nothing"
@@ -180,7 +186,10 @@ public class BootDashDockerTests {
@Test
public void projectWithdDockerFileNoTag() throws Exception {
GenericRemoteBootDashModel<DockerClient, DockerTargetParams> model = createDockerTarget();
IProject project = projects.createBootWebProject("webby", bootVersionAtLeast("2.3.0"));
IProject project = projects.createBootWebProject("webby",
bootVersionAtLeast("2.3.0"),
withJavaVersion("11")
);
createExeFile(project, "sts-docker-build.sh",
"#!/bin/bash\n" +
"docker build ."