From ddaa9f12dbb1354f61c9a9eb6dcf9f39da177014 Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Tue, 4 Oct 2016 14:43:45 -0300 Subject: [PATCH] Use getRegistryAndName from docker-toolbelt 1.2.0 --- CHANGELOG.md | 2 ++ package.json | 2 +- src/docker-utils.coffee | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3e69c80..970f348f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +* Use getRegistryAndName from docker-toolbelt 1.2.0 [Pablo] + # v2.5.0 * Switch to v2 api to be able to set is_online [Page] diff --git a/package.json b/package.json index 62d74bf2..ba194212 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "buffer-equal-constant-time": "^1.0.1", "docker-delta": "0.0.12", "docker-progress": "^2.1.0", - "docker-toolbelt": "^1.0.0", + "docker-toolbelt": "^1.2.0", "dockerode": "~2.2.9", "event-stream": "^3.0.20", "express": "^4.0.0", diff --git a/src/docker-utils.coffee b/src/docker-utils.coffee index 56697ce0..a17d6f5b 100644 --- a/src/docker-utils.coffee +++ b/src/docker-utils.coffee @@ -1,5 +1,5 @@ Docker = require 'docker-toolbelt' -{ getRegistryAndName, DockerProgress } = require 'docker-progress' +{ DockerProgress } = require 'docker-progress' Promise = require 'bluebird' progress = require 'request-progress' dockerDelta = require 'docker-delta' @@ -46,7 +46,7 @@ findSimilarImage = (repoTag) -> DELTA_REQUEST_TIMEOUT = 15 * 60 * 1000 getRepoAndTag = (image) -> - getRegistryAndName(image) + docker.getRegistryAndName(image) .then ({ registry, imageName, tagName }) -> registry = registry.toString().replace(':443', '') return { repo: "#{registry}/#{imageName}", tag: tagName }