diff --git a/controllers/images.js b/controllers/images.js index bd77e01..fa34774 100644 --- a/controllers/images.js +++ b/controllers/images.js @@ -3,7 +3,7 @@ import { dockerImages } from 'systeminformation'; export const Images = async function(req, res) { - let images = await dockerImages({ all: true }); + let images = await docker.listImages({ all: true }); let image_list = ` @@ -23,20 +23,24 @@ export const Images = async function(req, res) { for (let i = 0; i < images.length; i++) { - let image = ` - - - ${images[i].repoTags} - ${images[i].id} - Latest - In use - August 05, 2021 - 69.27 MB - Details - ` + let date = new Date(images[i].Created * 1000); + let created = date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }); - - image_list += image; + let size = images[i].Size / 1000 / 1000; // to match docker desktop + size = size.toFixed(2); + + let details = ` + + + ${images[i].RepoTags} + ${images[i].Id} + Latest + In use + ${created} + ${size} + Details + ` + image_list += details; } image_list += `` @@ -46,7 +50,8 @@ export const Images = async function(req, res) { name: req.session.user, role: req.session.role, avatar: req.session.avatar, - image_list: image_list + image_list: image_list, + image_count: images.length }); } \ No newline at end of file diff --git a/views/images.ejs b/views/images.ejs index f16b92d..6cda70b 100644 --- a/views/images.ejs +++ b/views/images.ejs @@ -134,7 +134,7 @@ -

3 Images

+

<%- image_count %> Images