From d7769dec33434c0ffbe64bd35f0536d49178c27d Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 9 Aug 2017 10:40:46 +0200 Subject: [PATCH] =?UTF-8?q?fix(images):=20fix=20the=20way=20the=20registry?= =?UTF-8?q?=20and=20image=20name=20are=20extracted=20fr=E2=80=A6=20(#1099)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(images): fix the way the registry and image name are extracted from a repository --- app/helpers/imageHelper.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/helpers/imageHelper.js b/app/helpers/imageHelper.js index 7c3012fbc..324f28519 100644 --- a/app/helpers/imageHelper.js +++ b/app/helpers/imageHelper.js @@ -8,10 +8,15 @@ angular.module('portainer.helpers') var slashCount = _.countBy(repository)['/']; var registry = null; var image = repository; - if (slashCount > 1) { - // assume something/some/thing[/...] + if (slashCount >= 1) { + // assume something/something[/...] registry = repository.substr(0, repository.indexOf('/')); - image = repository.substr(repository.indexOf('/') + 1); + // assume valid DNS name or IP (contains at least one '.') + if (_.countBy(registry)['.'] > 0) { + image = repository.substr(repository.indexOf('/') + 1); + } else { + registry = null; + } } return {