Merge pull request #14 from JWGmeligMeyling/spotify-client

Spotify Docker client for Build Manager

.gitignore

@@ -62,3 +62,6 @@ build-models/.settings
 
 build-server/target/
 build-server/.settings
+.DS_Store
+.idea/
+*.iml

build-client/pom.xml

@@ -14,6 +14,12 @@
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-client</artifactId>
 			<version>${resteasy.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-simple</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>nl.tudelft.ewi.build</groupId>

build-models/src/main/java/nl/tudelft/ewi/build/jaxrs/models/BuildRequest.java

@@ -11,6 +11,6 @@ public class BuildRequest {
 
 	private String callbackUrl;
 
-	private int timeout;
+	private Integer timeout;
 
 }

build-server/pom.xml

@@ -29,6 +29,12 @@
 		</dependency>
 
 		<!-- Utilities -->
+
+		<dependency>
+		  <groupId>com.spotify</groupId>
+		  <artifactId>docker-client</artifactId>
+		  <version>2.7.19</version>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
@@ -44,6 +50,21 @@
 			<artifactId>jtar</artifactId>
 			<version>1.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-guice</artifactId>
+			<version>${resteasy.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-simple</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>httpclient</artifactId>
+					<groupId>org.apache.httpcomponents</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<build>

build-server/src/main/java/nl/tudelft/ewi/build/BuildServerModule.java

@@ -7,10 +7,13 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.AbstractModule;
+import com.spotify.docker.client.DefaultDockerClient;
+import com.spotify.docker.client.DockerClient;
+
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import nl.tudelft.ewi.build.docker.DockerManager;
-import nl.tudelft.ewi.build.docker.DockerManagerImpl;
 import nl.tudelft.ewi.build.jaxrs.json.MappingModule;
+
 import org.jboss.resteasy.plugins.guice.ext.JaxrsModule;
 import org.jboss.resteasy.plugins.guice.ext.RequestScopeModule;
 import org.reflections.Reflections;
@@ -25,6 +28,7 @@ public BuildServerModule(Config config) {
 	}
 
 	@Override
+	@SneakyThrows
 	protected void configure() {
 		install(new RequestScopeModule());
 		install(new JaxrsModule());
@@ -39,7 +43,9 @@ public ObjectMapper get() {
 			}
 		});
 
-		bind(DockerManager.class).to(DockerManagerImpl.class);
+		bind(DockerClient.class).toInstance(DefaultDockerClient.fromEnv()
+				.readTimeoutMillis(DefaultDockerClient.NO_TIMEOUT)
+				.build());
 
 		findResourcesWith(Path.class);
 		findResourcesWith(Provider.class);

build-server/src/main/java/nl/tudelft/ewi/build/Config.java

@@ -7,8 +7,6 @@ public interface Config {
 
 	int getMaximumConcurrentJobs();
 
-	String getDockerHost();
-
 	String getStagingDirectory();
 
 	String getWorkingDirectory();

build-server/src/main/java/nl/tudelft/ewi/build/PropertyBasedConfig.java

@@ -33,10 +33,6 @@ public int getMaximumConcurrentJobs() {
 		return Integer.parseInt(properties.getProperty("docker.max-containers"));
 	}
 
-	public String getDockerHost() {
-		return properties.getProperty("docker.host", "http://localhost:4243");
-	}
-
 	public String getStagingDirectory() {
 		return properties.getProperty("docker.staging-directory");
 	}