test

Author: satackey

main.ts

@@ -1,13 +1,15 @@
 import * as core from '@actions/core'
-
+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 })
   const restoreKeys = core.getInput(`restore-keys`, { required: false }).split(`\n`).filter(key => key !== ``)
 
-  const layerCache = new LayerCache(repotag)
+  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 restoredKey = await layerCache.restore(primaryKey, restoreKeys)
   await layerCache.cleanUp()
 

package.json

@@ -9,10 +9,13 @@
     "@actions/cache": "^0.2.1",
     "@actions/core": "^1.2.4",
     "actions-exec-listener": "^0.0.1",
+    "crypto": "^1.0.1",
+    "string-format": "^2.0.0",
     "typescript-is": "^0.16.2"
   },
   "devDependencies": {
     "@types/node": "^14.0.11",
+    "@types/string-format": "^2.0.0",
     "@zeit/ncc": "^0.22.3",
     "ts-node": "^8.10.2",
     "ttypescript": "^1.5.10",

post.ts

@@ -1,4 +1,5 @@
 import * as core from '@actions/core'
+import exec from 'actions-exec-listener'
 
 import { LayerCache } from './src/LayerCache'
 const main = async () => {
@@ -10,7 +11,14 @@ const main = async () => {
     return
   }
 
-  const layerCache = new LayerCache(repotag)
+  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))
   await layerCache.store(primaryKey)
   await layerCache.cleanUp()
 }

src/LayerCache.ts

@@ -1,22 +1,26 @@
 import * as path from 'path'
 import exec from 'actions-exec-listener'
+import crypto from 'crypto'
 import * as core from '@actions/core'
 import * as cache from '@actions/cache'
 import { ExecOptions } from '@actions/exec/lib/interfaces'
 import { promises as fs } from 'fs'
 import { assertManifests, Manifest, Manifests } from './Tar'
+import format from 'string-format'
 
 class LayerCache {
-  repotag: string
+  // repotag: string
+  ids: string[]
   originalKeyToStore: string = ''
   // tarFile: string = ''
   imagesDir: string = path.resolve(`${process.cwd()}/./.action-docker-layer-caching-docker_images`)
   enabledParallel = true
   // unpackedTarDir: string = ''
   // manifests: Manifests = []
 
-  constructor(repotag: string) {
-    this.repotag = repotag
+  constructor(ids: string[]) {
+    // this.repotag = repotag
+    this.ids = ids
   }
 
   async exec(command: string, args?: string[], options?: ExecOptions) {
@@ -30,6 +34,9 @@ class LayerCache {
 
   async store(key: string) {
     this.originalKeyToStore = key
+    // this.originalKeyToStore = format(key, {
+    //   hash: this.getIdhashesPathFriendly()
+    // })
     await this.saveImageAsUnpacked()
     if (this.enabledParallel) {
       await this.separateAllLayerCaches()
@@ -46,7 +53,7 @@ class LayerCache {
 
   private async saveImageAsUnpacked() {
     await this.exec('mkdir -p', [this.getSavedImageTarDir()])
-    await this.exec(`sh -c`, [`docker save '${(await this.makeRepotagsDockerSaveArgReady([this.repotag])).join(`' '`)}' | tar xf - -C ${this.getSavedImageTarDir()}`])
+    await this.exec(`sh -c`, [`docker save '${(await this.makeRepotagsDockerSaveArgReady(this.ids)).join(`' '`)}' | tar xf - -C ${this.getSavedImageTarDir()}`])
   }
 
   private async makeRepotagsDockerSaveArgReady(repotags: string[]): Promise<string[]> {
@@ -191,19 +198,19 @@ class LayerCache {
   }
 
   getUnpackedTarDir(): string {
-    return `${this.getImagesDir()}/${this.getRepotagPathFriendly()}`
+    return `${this.getImagesDir()}/${this.getIdhashesPathFriendly()}`
   }
 
   getLayerCachesDir() {
     return `${this.getUnpackedTarDir()}-layers`
   }
 
   getSavedImageTarDir(): string {
-    return `${this.getImagesDir()}/${this.getRepotagPathFriendly()}`
+    return `${this.getImagesDir()}/${this.getIdhashesPathFriendly()}`
   }
 
-  getRepotagPathFriendly(): string {
-    return this.repotag.replace('/', '-') 
+  getIdhashesPathFriendly(): string {
+    return crypto.createHash(`sha256`).update(this.ids.join(`-`), `utf8`).digest(`hex`)
   }
 
   getRootKey(): string {

yarn.lock

@@ -52,6 +52,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.11.tgz#61d4886e2424da73b7b25547f59fdcb534c165a3"
   integrity sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg==
 
+"@types/string-format@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/string-format/-/string-format-2.0.0.tgz#c1588f507be7b8ef5eb5074a41e48e4538f3f6d5"
+  integrity sha512-mMwtmgN0ureESnJ3SuMM4W9lsi4CgOxs43YxNo14SDHgzJ+OPYO3yM7nOTJTh8x5YICseBdtrySUbvxnpb+NYQ==
+
 "@zeit/ncc@^0.22.3":
   version "0.22.3"
   resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.22.3.tgz#fca6b86b4454ce7a7e1e7e755165ec06457f16cd"
@@ -92,6 +97,11 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
+crypto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037"
+  integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -149,6 +159,11 @@ source-map@^0.6.0:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+string-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b"
+  integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==
+
 ts-node@^8.10.2:
   version "8.10.2"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"