mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Make launch script integration tests compatible with Spring Framework 4.3
Previously, the launch script integration tests used Jackson 2.1 to align with the requirements of docker-java 2.x. This stopped working when we upgraded to Spring Framework 4.3 which requires Jackson 2.6+. This commit updates the launch script integration tests to use docker-java 3.0.0-RC1 which is compatible with Jackson 2.6.x. An added benefit is that 3.0 also adds support for copying an archive to a container, allowing the custom command that performs this function to be removed. Closes gh-5278
This commit is contained in:
parent
1ca9cdabf7
commit
2c619f8d93
@ -19,7 +19,6 @@
|
||||
<properties>
|
||||
<main.basedir>${basedir}/..</main.basedir>
|
||||
<java.version>1.8</java.version>
|
||||
<jackson.version>2.1.2</jackson.version> <!-- Align with docker-java -->
|
||||
</properties>
|
||||
<modules>
|
||||
<module>spring-boot-gradle-tests</module>
|
||||
|
@ -36,7 +36,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.docker-java</groupId>
|
||||
<artifactId>docker-java</artifactId>
|
||||
<version>2.1.4</version>
|
||||
<version>3.0.0-RC1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -17,30 +17,18 @@
|
||||
package org.springframework.boot.launchscript;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.ws.rs.client.ClientRequestContext;
|
||||
import javax.ws.rs.client.ClientRequestFilter;
|
||||
import javax.ws.rs.client.Entity;
|
||||
import javax.ws.rs.client.WebTarget;
|
||||
|
||||
import com.github.dockerjava.api.DockerClient;
|
||||
import com.github.dockerjava.api.command.DockerCmd;
|
||||
import com.github.dockerjava.api.model.Frame;
|
||||
import com.github.dockerjava.core.CompressArchiveUtil;
|
||||
import com.github.dockerjava.core.DockerClientBuilder;
|
||||
import com.github.dockerjava.core.DockerClientConfig;
|
||||
import com.github.dockerjava.core.command.AttachContainerResultCallback;
|
||||
import com.github.dockerjava.core.command.BuildImageResultCallback;
|
||||
import com.github.dockerjava.jaxrs.AbstrSyncDockerCmdExec;
|
||||
import com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl;
|
||||
import com.github.dockerjava.core.command.WaitContainerResultCallback;
|
||||
import org.assertj.core.api.Condition;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@ -63,8 +51,6 @@ import static org.junit.Assume.assumeThat;
|
||||
@RunWith(Parameterized.class)
|
||||
public class SysVinitLaunchScriptIT {
|
||||
|
||||
private final SpringBootDockerCmdExecFactory commandExecFactory = new SpringBootDockerCmdExecFactory();
|
||||
|
||||
private static final char ESC = 27;
|
||||
|
||||
private final String os;
|
||||
@ -223,7 +209,8 @@ public class SysVinitLaunchScriptIT {
|
||||
|
||||
});
|
||||
resultCallback.awaitCompletion(60, TimeUnit.SECONDS).close();
|
||||
docker.waitContainerCmd(container).exec();
|
||||
docker.waitContainerCmd(container).exec(new WaitContainerResultCallback())
|
||||
.awaitCompletion(60, TimeUnit.SECONDS);
|
||||
return output.toString();
|
||||
}
|
||||
finally {
|
||||
@ -234,8 +221,7 @@ public class SysVinitLaunchScriptIT {
|
||||
private DockerClient createClient() {
|
||||
DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
|
||||
.build();
|
||||
DockerClient docker = DockerClientBuilder.getInstance(config)
|
||||
.withDockerCmdExecFactory(this.commandExecFactory).build();
|
||||
DockerClient docker = DockerClientBuilder.getInstance(config).build();
|
||||
return docker;
|
||||
}
|
||||
|
||||
@ -264,10 +250,9 @@ public class SysVinitLaunchScriptIT {
|
||||
new File("src/test/resources/scripts/" + script));
|
||||
}
|
||||
|
||||
private void copyToContainer(DockerClient docker, final String container,
|
||||
final File file) {
|
||||
this.commandExecFactory.createCopyToContainerCmdExec()
|
||||
.exec(new CopyToContainerCmd(container, file));
|
||||
private void copyToContainer(DockerClient docker, String container, File file) {
|
||||
docker.copyArchiveToContainerCmd(container)
|
||||
.withHostResource(file.getAbsolutePath()).exec();
|
||||
}
|
||||
|
||||
private File findApplication() {
|
||||
@ -309,81 +294,4 @@ public class SysVinitLaunchScriptIT {
|
||||
"Failed to extract " + label + " from output: " + output);
|
||||
}
|
||||
|
||||
private static final class CopyToContainerCmdExec
|
||||
extends AbstrSyncDockerCmdExec<CopyToContainerCmd, Void> {
|
||||
|
||||
private CopyToContainerCmdExec(WebTarget baseResource,
|
||||
DockerClientConfig dockerClientConfig) {
|
||||
super(baseResource, dockerClientConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Void execute(CopyToContainerCmd command) {
|
||||
try {
|
||||
InputStream streamToUpload = new FileInputStream(CompressArchiveUtil
|
||||
.archiveTARFiles(command.getFile().getParentFile(),
|
||||
Arrays.asList(command.getFile()),
|
||||
command.getFile().getName()));
|
||||
WebTarget webResource = getBaseResource().path("/containers/{id}/archive")
|
||||
.resolveTemplate("id", command.getContainer());
|
||||
webResource.queryParam("path", ".")
|
||||
.queryParam("noOverwriteDirNonDir", false).request()
|
||||
.put(Entity.entity(streamToUpload, "application/x-tar")).close();
|
||||
return null;
|
||||
}
|
||||
catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static final class CopyToContainerCmd implements DockerCmd<Void> {
|
||||
|
||||
private final String container;
|
||||
|
||||
private final File file;
|
||||
|
||||
private CopyToContainerCmd(String container, File file) {
|
||||
this.container = container;
|
||||
this.file = file;
|
||||
}
|
||||
|
||||
public String getContainer() {
|
||||
return this.container;
|
||||
}
|
||||
|
||||
public File getFile() {
|
||||
return this.file;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static final class SpringBootDockerCmdExecFactory
|
||||
extends DockerCmdExecFactoryImpl {
|
||||
|
||||
private SpringBootDockerCmdExecFactory() {
|
||||
withClientRequestFilters(new ClientRequestFilter() {
|
||||
|
||||
@Override
|
||||
public void filter(ClientRequestContext requestContext)
|
||||
throws IOException {
|
||||
// Workaround for https://go-review.googlesource.com/#/c/3821/
|
||||
requestContext.getHeaders().add("Connection", "close");
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private CopyToContainerCmdExec createCopyToContainerCmdExec() {
|
||||
return new CopyToContainerCmdExec(getBaseResource(), getDockerClientConfig());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user