Skip to content

Commit

Permalink
[JBIDE-22764] maintain compatibility between Neon.0 and Neon.1 versio…
Browse files Browse the repository at this point in the history
…ns of Docker tooling (#1258)

Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information
fbricon authored Jul 19, 2016
1 parent ec63bba commit a677570
Showing 1 changed file with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import org.jboss.tools.openshift.internal.common.core.job.AbstractDelegatingMonitorJob;
import org.jboss.tools.openshift.internal.ui.OpenShiftUIActivator;

import com.spotify.docker.client.DockerCertificateException;

/**
* {@link Job} to push an image from a Docker daemon into the OpenShift registry
*/
Expand Down Expand Up @@ -66,10 +64,10 @@ protected IStatus doRun(final IProgressMonitor monitor) {
// then we can push that image with the new name
this.dockerConnection.pushImage(tmpImageName, registryAccount,
new ImagePushProgressHandler(this.dockerConnection, tmpImageName));
}
// FIXME: needs to catch DockerCertificateException until
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=495249 is fixed
catch (DockerException | InterruptedException | DockerCertificateException e) {
// FIXME: needs more fined tuned error handling once Neon.0 is no longer supported:
// catch (DockerException | InterruptedException e) {
// see https://issues.jboss.org/browse/JBIDE-22764
} catch (Exception e) {
return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
"Failed to push the selected Docker image into OpenShift registry", e);
} finally {
Expand Down

0 comments on commit a677570

Please sign in to comment.