diff options
| author | Roland Grunberg | 2015-12-15 17:47:17 +0000 |
|---|---|---|
| committer | Roland Grunberg | 2015-12-15 19:01:15 +0000 |
| commit | 2bd239c34dd8201e72b1bfe9880026018d6b19b8 (patch) | |
| tree | f052453c6eae0774e2810ddcfc5e59c4fc397747 /containers | |
| parent | fc1e5fc51db0f4557720e02e9cf107c793fcca9b (diff) | |
| download | org.eclipse.linuxtools-2bd239c34dd8201e72b1bfe9880026018d6b19b8.tar.gz org.eclipse.linuxtools-2bd239c34dd8201e72b1bfe9880026018d6b19b8.tar.xz org.eclipse.linuxtools-2bd239c34dd8201e72b1bfe9880026018d6b19b8.zip | |
Bug 484344: Cannot attach to any container after image build.
Workaround for 'Hijack is incompatible with use of CloseNotifier'.
Simply ensure that the image build is done on a separate client copy.
Change-Id: Ie744bf041932d3612105f15e85ff82377458c95f
Reviewed-on: https://git.eclipse.org/r/62751
Tested-by: Hudson CI
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
Diffstat (limited to 'containers')
| -rw-r--r-- | containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java index 0addcfdf5f..8ee2f92144 100644 --- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java +++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java @@ -885,7 +885,7 @@ public class DockerConnection implements IDockerConnection, Closeable { final DockerProgressHandler d = new DockerProgressHandler(handler); final java.nio.file.Path p = FileSystems.getDefault() .getPath(path.makeAbsolute().toOSString()); - return client.build(p, d, BuildParameter.FORCE_RM); + return getClientCopy().build(p, d, BuildParameter.FORCE_RM); } catch (com.spotify.docker.client.DockerRequestException e) { throw new DockerException(e.message()); } catch (com.spotify.docker.client.DockerException | IOException e) { @@ -902,7 +902,7 @@ public class DockerConnection implements IDockerConnection, Closeable { DockerProgressHandler d = new DockerProgressHandler(handler); java.nio.file.Path p = FileSystems.getDefault().getPath( path.makeAbsolute().toOSString()); - return client.build(p, name, d, BuildParameter.FORCE_RM); + return getClientCopy().build(p, name, d, BuildParameter.FORCE_RM); } catch (com.spotify.docker.client.DockerRequestException e) { throw new DockerException(e.message()); } catch (com.spotify.docker.client.DockerException | IOException e) { @@ -937,7 +937,7 @@ public class DockerConnection implements IDockerConnection, Closeable { final DockerProgressHandler d = new DockerProgressHandler(handler); final java.nio.file.Path p = FileSystems.getDefault() .getPath(path.makeAbsolute().toOSString()); - return client.build(p, name, d, getBuildParameters(buildOptions)); + return getClientCopy().build(p, name, d, getBuildParameters(buildOptions)); } catch (com.spotify.docker.client.DockerRequestException e) { throw new DockerException(e.message()); } catch (com.spotify.docker.client.DockerException | IOException e) { |