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

GH-684: updated java docker library to fix issue with jna not working correctly on Apple Silicon

Browse Source
This commit is contained in:
Martin Lippert
2021-09-16 21:23:25 +02:00
parent 3d39e51422
commit 521cc8b670
17 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerRunTargetType.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 Pivotal, Inc.
* Copyright (c) 2020, 2021 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,7 +34,6 @@ import com.github.dockerjava.api.DockerClient;
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 DockerRunTargetType extends AbstractRemoteRunTargetType<DockerTargetParams> {
@@ -85,9 +84,7 @@ public class DockerRunTargetType extends AbstractRemoteRunTargetType<DockerTarge
DockerHttpClient httpClient = new ZerodepDockerHttpClient.Builder()
.dockerHost(conf.getDockerHost())
.sslConfig(conf.getSSLConfig())
.connectionPool(new ConnectionPoolConfig()
.setMaxConnections(200)
)
.maxConnections(200)
.build();
return DockerClientImpl.getInstance(conf, httpClient);
}

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

@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src"/>
<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/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 exported="true" kind="lib" path="dependency/slf4j-simple-1.7.30.jar"/>
<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 exported="true" kind="lib" path="dependency/commons-compress-1.21.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/jna-5.8.0.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-api-3.2.12.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-core-3.2.12.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-3.2.12.jar"/>
<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-zerodep-3.2.12.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

10
eclipse-extensions/org.springframework.ide.eclipse.docker.client/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,8 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11

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

@@ -4,23 +4,23 @@ Bundle-Name: org.springframework.ide.eclipse.docker.client.wrapper
Bundle-SymbolicName: org.springframework.ide.eclipse.docker.client;singleton:=true
Bundle-Version: 4.12.1.qualifier
Automatic-Module-Name: org.springframework.ide.eclipse.docker.client.wrapper
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: .,
dependency/bcpkix-jdk15on-1.64.jar,
dependency/bcprov-jdk15on-1.64.jar,
dependency/commons-compress-1.20.jar,
dependency/commons-compress-1.21.jar,
dependency/commons-io-2.6.jar,
dependency/commons-lang-2.6.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/jna-5.8.0.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
dependency/docker-java-api-3.2.12.jar,
dependency/docker-java-core-3.2.12.jar,
dependency/docker-java-transport-3.2.12.jar,
dependency/docker-java-transport-zerodep-3.2.12.jar
Export-Package: com.github.dockerjava.api,
com.github.dockerjava.api.async,
com.github.dockerjava.api.command,

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

@@ -5,16 +5,16 @@ bin.includes = META-INF/,\
dependency/,\
dependency/bcpkix-jdk15on-1.64.jar,\
dependency/bcprov-jdk15on-1.64.jar,\
dependency/commons-compress-1.20.jar,\
dependency/commons-compress-1.21.jar,\
dependency/commons-io-2.6.jar,\
dependency/commons-lang-2.6.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/jna-5.8.0.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
dependency/docker-java-api-3.2.12.jar,\
dependency/docker-java-core-3.2.12.jar,\
dependency/docker-java-transport-3.2.12.jar,\
dependency/docker-java-transport-zerodep-3.2.12.jar

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.20.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.21.jar Normal file
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-3.2.12.jar Normal file
View File

Binary file not shown.

BIN
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-99.99.99-SNAPSHOT.jar → eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-3.2.12.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-3.2.12.jar Normal file
View File

Binary file not shown.

BIN
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-99.99.99-SNAPSHOT.jar → eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-3.2.12.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.5.0.jar
View File

Binary file not shown.

BIN
eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.8.0.jar Normal file
View File

Binary file not shown.

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

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

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

@@ -7,7 +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.ConnectionPoolConfig;
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
public class DockerClientWrapperApplication {
@@ -28,11 +28,11 @@ public class DockerClientWrapperApplication {
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());
}
// if (httpClient instanceof ConnectionPoolConfig) {
// ConnectionPoolConfig cp = (ConnectionPoolConfig) httpClient;
// System.out.println("max = " +cp.getPoolSizeMax());
// System.out.println("max per route = "+cp.getPoolSizeDefaultMaxPerRoute());
// }
}