ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-05-06 10:58:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix routing for deleting images with a slash in the name

Browse Source
This commit is contained in:
Pablo Carranza Velez 2016-05-17 19:18:39 +00:00
parent 7b9eaeea3a
commit 951bd2888f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api.coffee
View File

@ -171,7 +171,7 @@ module.exports = (application) ->
res.json(device.getState()) res.json(device.getState())
unparsedRouter.post '/v1/images/create', dockerUtils.createImage unparsedRouter.post '/v1/images/create', dockerUtils.createImage
unparsedRouter.delete '/v1/images/:name', dockerUtils.deleteImage unparsedRouter.delete '/v1/images/*', dockerUtils.deleteImage
unparsedRouter.get '/v1/images', dockerUtils.listImages unparsedRouter.get '/v1/images', dockerUtils.listImages
parsedRouter.post '/v1/containers/create', dockerUtils.createContainer parsedRouter.post '/v1/containers/create', dockerUtils.createContainer
parsedRouter.post '/v1/containers/:id/start', dockerUtils.startContainer parsedRouter.post '/v1/containers/:id/start', dockerUtils.startContainer

7
src/docker-utils.coffee
View File

@ -262,13 +262,14 @@ do ->
res.status(500).send(err?.message or err or 'Unknown error') res.status(500).send(err?.message or err or 'Unknown error')
exports.deleteImage = (req, res) -> exports.deleteImage = (req, res) ->
imageName = req.params[0]
Promise.using lockImages(), -> Promise.using lockImages(), ->
knex('image').select().where('repoTag', req.params.name) knex('image').select().where('repoTag', imageName)
.then (images) -> .then (images) ->
throw new Error('Only images created via the Supervisor can be deleted.') if images.length == 0 throw new Error('Only images created via the Supervisor can be deleted.') if images.length == 0
knex('image').where('repoTag', req.params.name).delete() knex('image').where('repoTag', imageName).delete()
.then -> .then ->
docker.getImage(req.params.name).removeAsync(sanitizeQuery(req.query)) docker.getImage(imageName).removeAsync(sanitizeQuery(req.query))
.then (data) -> .then (data) ->
res.json(data) res.json(data)
.catch (err) -> .catch (err) ->