diff --git a/docker-client.spec b/docker-client.spec index ab7438e..73d87b2 100644 --- a/docker-client.spec +++ b/docker-client.spec @@ -1,12 +1,15 @@ Name: docker-client Version: 6.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Docker Client License: ASL 2.0 URL: https://github.com/spotify/docker-client Source0: https://github.com/spotify/docker-client/archive/v%{version}.tar.gz +# See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=530264 +Patch1: fix-copy-from-container-failure-ebz530264.patch + BuildRequires: maven-local BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) BuildRequires: mvn(com.fasterxml.jackson.datatype:jackson-datatype-guava) @@ -33,6 +36,8 @@ The Docker Client is a Java API library for accessing a Docker daemon. %prep %setup -q -n docker-client-%{version} +%patch1 -p1 + # The parent pom doen't add anything we can't live without %pom_remove_parent sed -i -e '//acom.spotify' pom.xml @@ -74,6 +79,9 @@ sed -i -e '//acom.spotify' pom.xml %doc NOTICE README.md %changelog +* Wed Jan 31 2018 Mat Booth - 6.2.5-3 +- Add patch to fix ebz#530264 + * Fri Jan 26 2018 Mat Booth - 6.2.5-2 - Remove dep on jaxb-api diff --git a/fix-copy-from-container-failure-ebz530264.patch b/fix-copy-from-container-failure-ebz530264.patch new file mode 100644 index 0000000..62e9c45 --- /dev/null +++ b/fix-copy-from-container-failure-ebz530264.patch @@ -0,0 +1,21 @@ +diff --git a/src/main/java/com/spotify/docker/client/DefaultDockerClient.java +b/src/main/java/com/spotify/docker/client/DefaultDockerClient.java +index 0c3d7cd..9a61c8b 100644 +--- a/src/main/java/com/spotify/docker/client/DefaultDockerClient.java ++++ b/src/main/java/com/spotify/docker/client/DefaultDockerClient.java +@@ -350,6 +350,7 @@ + final ClientConfig config = DEFAULT_CONFIG + .connectorProvider(new ApacheConnectorProvider()) + .property(ApacheClientProperties.CONNECTION_MANAGER, cm) ++ .property(ApacheClientProperties.CONNECTION_MANAGER_SHARED, true) + .property(ApacheClientProperties.REQUEST_CONFIG, requestConfig); + + this.authConfig = builder.authConfig; +@@ -365,6 +366,7 @@ + this.noTimeoutClient = clientBuilderSupplier.get() + .withConfig(config) + .property(ApacheClientProperties.CONNECTION_MANAGER, noTimeoutCm) ++ .property(ApacheClientProperties.CONNECTION_MANAGER_SHARED, true) + .property(ApacheClientProperties.REQUEST_CONFIG, noReadTimeoutRequestConfig) + .build(); +