Allow passing tag when using fromImage in /v1/images/create

This commit is contained in:
Pablo Carranza Velez 2016-05-12 18:29:48 -03:00
parent dcc3717949
commit 3a77c2ec4b

View File

@ -246,13 +246,14 @@ do ->
{ registry, repo, tag, fromImage, fromSrc } = req.query { registry, repo, tag, fromImage, fromSrc } = req.query
if fromImage? if fromImage?
repoTag = fromImage repoTag = fromImage
repoTag += ':' + tag if tag?
else else
repoTag = buildRepoTag(repo, tag, registry) repoTag = buildRepoTag(repo, tag, registry)
Promise.using lockImages(), -> Promise.using lockImages(), ->
knex('image').insert({ repoTag }) knex('image').insert({ repoTag })
.then -> .then ->
if fromImage? if fromImage?
docker.createImageAsync({ fromImage }) docker.createImageAsync({ fromImage, tag })
else else
docker.importImageAsync(req, { repo, tag, registry }) docker.importImageAsync(req, { repo, tag, registry })
.then (stream) -> .then (stream) ->