WIP

Author: satackey

.github/workflows/release.yml

@@ -54,8 +54,8 @@ jobs:
     - uses: ./action-dlc
       name: Run satackey/action-docker-layer-caching@${{ steps.extract.outputs.branch }}
       with:
-        repotag: test_project_node
-        key: docker-layer-caching-test_project_node-sha:${{ github.sha }}
+        key: docker-layer-caching-test_project_node-sha:${{ github.sha }}-{hash}
+        restore-keys: docker-layer-caching-test_project_node-sha:${{ github.sha }}-
 
     - run: docker-compose -f test_project/docker-compose.yml -p test_project build
 
@@ -81,8 +81,9 @@ jobs:
     - uses: ./action-dlc
       name: Run satackey/action-docker-layer-caching@${{ steps.extract.outputs.branch }}
       with:
-        repotag: test_project_node
-        key: docker-layer-caching-test_project_node-sha:${{ github.sha }}
+        # repotag: test_project_node
+        key: docker-layer-caching-test_project_node-sha:${{ github.sha }}-{hash}
+        restore-keys: docker-layer-caching-test_project_node-sha:${{ github.sha }}-
 
     - name: Show cached image info
       run: docker inspect test_project_node
@@ -132,8 +133,8 @@ jobs:
     - uses: ./action-dlc
       name: Run satackey/action-docker-layer-caching@${{ steps.extract.outputs.branch }}
       with:
-        repotag: amazon/aws-cli
-        key: docker-layer-caching-aws-cli-sha:${{ github.sha }}
+        key: docker-layer-caching-aws-cli-sha:${{ github.sha }}-{hash}
+        restore-keys: docker-layer-caching-aws-cli-sha:${{ github.sha }}-
 
     - run: docker run --rm amazon/aws-cli --version
 
@@ -157,8 +158,8 @@ jobs:
     - uses: ./action-dlc
       name: Run satackey/action-docker-layer-caching@${{ steps.extract.outputs.branch }}
       with:
-        repotag: amazon/aws-cli
-        key: docker-layer-caching-aws-cli-sha:${{ github.sha }}
+        key: docker-layer-caching-aws-cli-sha:${{ github.sha }}-{hash}
+        restore-keys: docker-layer-caching-aws-cli-sha:${{ github.sha }}-
 
     - name: Show cached image info
       run: docker inspect amazon/aws-cli

main.ts

@@ -3,17 +3,17 @@ import exec from 'actions-exec-listener'
 import { LayerCache } from './src/LayerCache'
 
 const main = async () => {
-  const repotag = core.getInput(`repotag`, { required: true })
+  // 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 !== ``))
 
-  const layerCache = new LayerCache([repotag])
+  const layerCache = new LayerCache([])
   const restoredKey = await layerCache.restore(primaryKey, restoreKeys)
   await layerCache.cleanUp()
 
-  core.saveState(`exists-primary-key`, primaryKey === restoredKey)
+  core.saveState(`restored-key`, JSON.stringify(restoredKey !== undefined ? restoredKey : ''))
 }
 
 main().catch(e => {

post.ts

@@ -3,22 +3,20 @@ import exec from 'actions-exec-listener'
 
 import { LayerCache } from './src/LayerCache'
 const main = async () => {
-  const repotag = core.getInput('repotag', { required: true })
   const primaryKey = core.getInput('key', { required: true })
-
-  if (JSON.parse(core.getState(`exists-primary-key`)) === true) {
-    core.info(`Key ${primaryKey} already exists, aborting.`)
-    return
-  }
-
+  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))
 
   const layerCache = new LayerCache(Array.from(imageIdsToSave))
+
+  core.debug(JSON.stringify({ restoredKey, formattedOriginalCacheKey: layerCache.getFormattedOriginalCacheKey()}))
+  if (restoredKey !== `` && restoredKey === layerCache.getFormattedOriginalCacheKey()) {
+    core.info(`Key ${restoredKey} already exists, aborting.`)
+    return
+  }
   await layerCache.store(primaryKey)
   await layerCache.cleanUp()
 }

src/LayerCache.ts

@@ -11,7 +11,7 @@ import format from 'string-format'
 class LayerCache {
   // repotag: string
   ids: string[]
-  originalKeyToStore: string = ''
+  originalKeyThatMayUnformatted: string = ''
   // tarFile: string = ''
   imagesDir: string = path.resolve(`${process.cwd()}/./.action-docker-layer-caching-docker_images`)
   enabledParallel = true
@@ -33,7 +33,7 @@ class LayerCache {
   }
 
   async store(key: string) {
-    this.originalKeyToStore = key
+    this.originalKeyThatMayUnformatted = key
     // this.originalKeyToStore = format(key, {
     //   hash: this.getIdhashesPathFriendly()
     // })
@@ -141,7 +141,7 @@ class LayerCache {
   // ---
 
   async restore(key: string, restoreKeys?: string[]) {
-    this.originalKeyToStore = key
+    this.originalKeyThatMayUnformatted = key
     // const restoreKeysIncludedRootKey = [key, ...(restoreKeys !== undefined ? restoreKeys : [])]
     const restoredCacheKey = await this.restoreRoot(restoreKeys)
     if (restoredCacheKey === undefined) {
@@ -167,8 +167,8 @@ class LayerCache {
     if (restoredCacheKeyMayUndefined === undefined) {
       return undefined
     }
-    this.originalKeyToStore = restoredCacheKeyMayUndefined.replace(/-root$/, '')
-    return this.originalKeyToStore
+    this.originalKeyThatMayUnformatted = restoredCacheKeyMayUndefined.replace(/-root$/, '')
+    return this.originalKeyThatMayUnformatted
   }
 
   private async restoreLayers() {
@@ -214,15 +214,21 @@ class LayerCache {
   }
 
   getRootKey(): string {
-    return `${this.originalKeyToStore}-root`
+    return `${this.getFormattedOriginalCacheKey()}-root`
   }
 
   genSingleLayerStorePath(id: string) {
     return `${this.getLayerCachesDir()}/${id}/layer.tar`
   }
 
   genSingleLayerStoreKey(id: string) {
-    return `layer-${this.originalKeyToStore}-${id}`
+    return `layer-${this.getFormattedOriginalCacheKey()}-${id}`
+  }
+
+  getFormattedOriginalCacheKey() {
+    return format(this.originalKeyThatMayUnformatted, {
+      hash: this.getIdhashesPathFriendly()
+    })
   }
 
   async getLayerTarFiles(): Promise<string[]> {