ImageDetector

Author: satackey

main.ts

@@ -1,13 +1,14 @@
 import * as core from '@actions/core'
 import exec from 'actions-exec-listener'
 import { LayerCache } from './src/LayerCache'
+import {  ImageDetector } from './src/ImageDetector'
 
 const main = async () => {
   // const repotag = core.getInput(`repotag`, { required: true })
   const primaryKey = core.getInput(`key`, { required: true })
   const restoreKeys = core.getInput(`restore-keys`, { required: false }).split(`\n`).filter(key => key !== ``)
 
-  core.saveState(`already-existing-image-ids`, (await exec.exec(`docker image ls -q`)).stdoutStr.split(`\n`).filter(id => id !== ``))
+  core.saveState(`already-existing-images`, JSON.stringify(await new ImageDetector().getExistingImages()))
 
   const layerCache = new LayerCache([])
   const restoredKey = await layerCache.restore(primaryKey, restoreKeys)

post.ts

@@ -2,16 +2,22 @@ import * as core from '@actions/core'
 import exec from 'actions-exec-listener'
 
 import { LayerCache } from './src/LayerCache'
+import { ImageDetector } from './src/ImageDetector'
+import { assertType } from 'typescript-is'
 const main = async () => {
   const primaryKey = core.getInput('key', { required: true })
   const restoredKey = JSON.parse(core.getState(`restored-key`)) as string
-  const alreadyExistingImageIds = JSON.parse(core.getState(`already-existing-image-ids`)) as string[]
-  const currentImageIds = (await exec.exec(`docker image ls -q`)).stdoutStr.split(`\n`).filter(id => id !== ``)
-  const imageIdsToSave = new Set([...currentImageIds])
-  alreadyExistingImageIds.forEach(id => imageIdsToSave.delete(id))
 
-  core.debug(JSON.stringify({ imageIdsToSave }))
-  const layerCache = new LayerCache(Array.from(imageIdsToSave))
+  const rawAlreadyExistingImages = core.getState(`already-existing-images`)
+  assertType<string>(rawAlreadyExistingImages)
+  const alreadyExistingImages = JSON.parse(rawAlreadyExistingImages)
+  assertType<string[]>(alreadyExistingImages)
+
+  const imageDetector = new ImageDetector()
+  imageDetector.registerAlreadyExistedImages(alreadyExistingImages)
+  imageDetector.getExistingImages()
+  core.debug(JSON.stringify({ imageIdsToSave: imageDetector.getImagesShouldSave() }))
+  const layerCache = new LayerCache(imageDetector.getImagesShouldSave())
 
   core.debug(JSON.stringify({ restoredKey, formattedOriginalCacheKey: layerCache.getFormattedOriginalCacheKey()}))
   if (restoredKey !== `` && restoredKey === layerCache.getFormattedOriginalCacheKey()) {

src/ImageDetector.ts

@@ -0,0 +1,22 @@
+import exec from 'actions-exec-listener'
+
+export class ImageDetector {
+  alreadyExistedImages: Set<string> = new Set()
+  existingImages: Set<string> = new Set()
+  registerAlreadyExistedImages(images: string[]) {
+    images.forEach(this.alreadyExistedImages.add)
+  }
+
+  async getExistingImages(): Promise<string[]> {
+    const ids = (await exec.exec(`docker`, `image ls -q`.split(' '))).stdoutStr.split(`\n`).filter(id => id !== ``)
+    const repotags = (await exec.exec(`docker`, `image ls --format '{{ .Repository }}:{{ .Tag }}'`.split(' '))).stdoutStr.split(`\n`).filter(id => id !== `` || !id.includes(`<node>`));
+    ([...ids, ...repotags]).forEach(this.existingImages.add)
+    return Array.from(this.existingImages)
+  }
+
+  getImagesShouldSave(): string[] {
+    const resultSet = new Set(this.existingImages.values())
+    this.alreadyExistedImages.forEach(resultSet.delete)
+    return Array.from(resultSet)
+  }
+}