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

Adopt locally build docker client

Browse Source 
- supports connection pool config

See: https://github.com/docker-java/docker-java/pull/1474
This commit is contained in:
Kris De Volder
2020-10-26 12:50:30 -07:00
parent 833950648b
commit 84ca8b4571
19 changed files with 136 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
eclipse-extensions/org.springframework.ide.eclipse.docker.client/.classpath
View File

@@ -1,22 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-api-99.99.99-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-core-99.99.99-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-99.99.99-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="dependency/bcpkix-jdk15on-1.64.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/bcprov-jdk15on-1.64.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/commons-compress-1.20.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/commons-io-2.6.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/commons-lang-2.6.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-api-3.2.5.jar" sourcepath="/home/kdvolder/.m2/repository/com/github/docker-java/docker-java-api/3.2.5/docker-java-api-3.2.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-core-3.2.5.jar" sourcepath="/home/kdvolder/.m2/repository/com/github/docker-java/docker-java-core/3.2.5/docker-java-core-3.2.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-3.2.5.jar" sourcepath="/home/kdvolder/.m2/repository/com/github/docker-java/docker-java-transport/3.2.5/docker-java-transport-3.2.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-zerodep-3.2.5.jar" sourcepath="/home/kdvolder/.m2/repository/com/github/docker-java/docker-java-transport-zerodep/3.2.5/docker-java-transport-zerodep-3.2.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/guava-19.0.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/jackson-annotations-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/jackson-core-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/jackson-databind-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/jna-5.5.0.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/slf4j-api-1.7.30.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="dependency/slf4j-simple-1.7.30.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

13
eclipse-extensions/org.springframework.ide.eclipse.docker.client/META-INF/MANIFEST.MF
View File

@@ -11,16 +11,16 @@ Bundle-ClassPath: .,
dependency/commons-compress-1.20.jar,
dependency/commons-io-2.6.jar,
dependency/commons-lang-2.6.jar,
dependency/docker-java-api-3.2.5.jar,
dependency/docker-java-core-3.2.5.jar,
dependency/docker-java-transport-3.2.5.jar,
dependency/docker-java-transport-zerodep-3.2.5.jar,
dependency/guava-19.0.jar,
dependency/jackson-annotations-2.11.2.jar,
dependency/jackson-core-2.11.2.jar,
dependency/jackson-databind-2.11.2.jar,
dependency/jna-5.5.0.jar,
dependency/slf4j-api-1.7.30.jar
dependency/slf4j-api-1.7.30.jar,
dependency/slf4j-simple-1.7.30.jar,
dependency/docker-java-api-99.99.99-SNAPSHOT.jar,
dependency/docker-java-core-99.99.99-SNAPSHOT.jar,
dependency/docker-java-transport-99.99.99-SNAPSHOT.jar,
dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar
Export-Package: com.github.dockerjava.api,
com.github.dockerjava.api.async,
com.github.dockerjava.api.command,
@@ -97,3 +97,4 @@ Export-Package: com.github.dockerjava.api,
com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.reactor.ssl,
com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.ssl,
com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.util
Require-Bundle: com.google.guava

10
eclipse-extensions/org.springframework.ide.eclipse.docker.client/build.properties
View File

@@ -8,13 +8,13 @@ bin.includes = META-INF/,\
dependency/commons-compress-1.20.jar,\
dependency/commons-io-2.6.jar,\
dependency/commons-lang-2.6.jar,\
dependency/docker-java-api-3.2.5.jar,\
dependency/docker-java-core-3.2.5.jar,\
dependency/docker-java-transport-3.2.5.jar,\
dependency/docker-java-transport-zerodep-3.2.5.jar,\
dependency/guava-19.0.jar,\
dependency/jackson-annotations-2.11.2.jar,\
dependency/jackson-core-2.11.2.jar,\
dependency/jackson-databind-2.11.2.jar,\
dependency/jna-5.5.0.jar,\
dependency/slf4j-api-1.7.30.jar
dependency/slf4j-api-1.7.30.jar,\
dependency/docker-java-api-99.99.99-SNAPSHOT.jar,\
dependency/docker-java-core-99.99.99-SNAPSHOT.jar,\
dependency/docker-java-transport-99.99.99-SNAPSHOT.jar,\
dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-3.2.5.jar → eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-99.99.99-SNAPSHOT.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-3.2.5.jar → eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-99.99.99-SNAPSHOT.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-3.2.5.jar → eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-99.99.99-SNAPSHOT.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-3.2.5.jar → eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/slf4j-simple-1.7.30.jar Normal file
View File

Binary file not shown.

9
eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/pom.xml
View File

@@ -22,12 +22,17 @@
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-core</artifactId>
<version>3.2.5</version>
<version>3.2.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-zerodep</artifactId>
<version>3.2.5</version>
<version>3.2.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.30</version>
</dependency>
</dependencies>

8
eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/src/main/java/com/example/demo/DockerClientWrapperApplication.java
View File

@@ -7,6 +7,7 @@ import com.github.dockerjava.api.model.Image;
import com.github.dockerjava.core.DefaultDockerClientConfig;
import com.github.dockerjava.core.DockerClientImpl;
import com.github.dockerjava.transport.DockerHttpClient;
import com.github.dockerjava.zerodep.ConnectionPoolConfig;
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
public class DockerClientWrapperApplication {
@@ -26,6 +27,13 @@ public class DockerClientWrapperApplication {
for (Image image : imgs) {
System.out.println(image.getId());
}
if (httpClient instanceof ConnectionPoolConfig) {
ConnectionPoolConfig cp = (ConnectionPoolConfig) httpClient;
System.out.println("max = " +cp.getPoolSizeMax());
System.out.println("max per route = "+cp.getPoolSizeDefaultMaxPerRoute());
}
}
}

4
eclipse-extensions/org.springframework.ide.eclipse.docker.client/readme.md
View File

@@ -1,4 +1,4 @@
Alternate Docker Client
com.github.dockerjavaAlternate Docker Client
=====================
Repackaged as a single osgi bundle with all its dependencies.
@@ -13,7 +13,7 @@ Packaging Process:
- Build the maven project `docker-client-wrapper` which is included as a sub-folder in this project.
- copy all the jars from `docker-client-wrapper/target/dependency` to `dependency`.
- Open `manifest.mf` with PDE tabbed editor. Select the 'Runtime' tab and then:
- clear out exported packages section then add all com.spotify.docker.client* packages back
- clear out exported packages section then add all `com.github.dockerjava*` packages back
- clear our 'classpath' section and all jars in the 'dependency folder.

25
eclipse-extensions/org.springframework.ide.eclipse.docker.client/src/simplelogger.properties Normal file
View File

@@ -0,0 +1,25 @@
# SLF4J's SimpleLogger configuration file
# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
# Default logging detail level for all instances of SimpleLogger.
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, defaults to "info".
#org.slf4j.simpleLogger.defaultLogLevel=debug
# Logging detail level for a SimpleLogger instance named "xxxxx".
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, the default logging detail level is used.
#org.slf4j.simpleLogger.log.xxxxx=
# Set to true if you want the current date and time to be included in output messages.
# Default is false, and will output the number of milliseconds elapsed since startup.
#org.slf4j.simpleLogger.showDateTime=false
# The date and time format to be used in the output messages.
# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
# If the format is not specified or is invalid, the default format is used.
# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
#org.slf4j.simpleLogger.logFile=/tmp/sts-docker-client.log
#org.slf4j.simpleLogger.log.com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager=debug

15
eclipse-extensions/org.springframework.ide.eclipse.docker.client/update-from-snapshot.sh Executable file
View File

@@ -0,0 +1,15 @@
#!/bin/bash
set -e
version_override=99.99.99-SNAPSHOT
export JAVA_HOME=/home/kdvolder/Applications/jdk1.8.0_271
cd ~/git/kdvolder/docker-java
./mvnw versions:set -DnewVersion=${version_override}
./mvnw clean package -Dmaven.test.skip=true
for f in \
docker-java-transport/target/docker-java-transport-${version_override}.jar \
docker-java-transport-zerodep/target/docker-java-transport-zerodep-${version_override}.jar \
docker-java-core/target/docker-java-core-${version_override}.jar \
docker-java-api/target/docker-java-api-${version_override}.jar
do
cp $f ~/git/sts4/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/
done