diff options
| author | Jeff Johnston | 2015-05-25 21:19:19 +0000 |
|---|---|---|
| committer | Roland Grunberg | 2015-06-01 14:44:14 +0000 |
| commit | 69effa8fb74f8a58ab6eb0f3d609f6789d824ef7 (patch) | |
| tree | 3fe3e21f638a7cf3e3e6b47c74dc9335ea9a6ad5 /containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties | |
| parent | 514cd212aa7f606570ab9ea361d51dead430e27a (diff) | |
| download | org.eclipse.linuxtools-69effa8fb74f8a58ab6eb0f3d609f6789d824ef7.tar.gz org.eclipse.linuxtools-69effa8fb74f8a58ab6eb0f3d609f6789d824ef7.tar.xz org.eclipse.linuxtools-69effa8fb74f8a58ab6eb0f3d609f6789d824ef7.zip | |
Fix bug 467748 - Progress monitors for pulling an image persist
- the Docker daemon is changing messages and so the handlers
have to be more tolerant of these changes
- add check for "Pull complete" message
- ignore "Pulling" messages
- fix DockerProgressDetail class to have toString() and equals()
methods
- fix job messages for Pulling and Pushing
Change-Id: Ic1582a9047dacb14b3d417b2035bf2bf22ba9f97
Reviewed-on: https://git.eclipse.org/r/48321
Tested-by: Hudson CI
Tested-by: Roland Grunberg <rgrunber@redhat.com>
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
Reviewed-on: https://git.eclipse.org/r/49093
Diffstat (limited to 'containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties')
| -rw-r--r-- | containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties index ae6b8aa40d..14f5fbd520 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/DVMessages.properties @@ -114,8 +114,10 @@ ImageDownloadComplete.msg=Download complete ImageDownloadingImage.msg=Downloading image id: {0} ImageDownloadingJobName.msg=Pulling docker image - {0} ImageDownloading.msg=Downloading +ImagePulling.msg=Pulling +ImagePullComplete.msg=Pull complete ImageDownloadingAlreadyExists.msg=Already exists -ImageDownloadingVerified.msg=The image you are pulling has been verified +ImageDownloadingVerified.msg=verified ImageUploadComplete.msg=Image successfully pushed ImageUploadAlreadyComplete.msg=already pushed, skipping @@ -170,7 +172,9 @@ ContainerCommitError.msg=Error committing container ImageBuild.msg=Building Image ImagePull.msg=Pulling Image +ImagePull.title=Pulling Image <{0}> ImagePush.msg=Pushing Image +ImagePush.title=Pushing Image <{0}> ContainersViewTitle.all.msg={0} ({1} Containers) ContainersViewTitle.filtered.msg={0} ({1}/{2} Containers) |