mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2025-02-22 02:16:43 +00:00
Allow passing tag when using fromImage in /v1/images/create
This commit is contained in:
parent
dcc3717949
commit
3a77c2ec4b
@ -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) ->
|
||||||
|
Loading…
x
Reference in New Issue
Block a user