Merge pull request #61 from jackmisbach/revert-extraction-and-builder-default

Revert extraction and builder default

Author: AkihiroSuda

action.yml

@@ -28,8 +28,8 @@ inputs:
     default: "ghcr.io/containerd/busybox:latest"
     description: "The container image to use for injecting and extracting the cache"
   builder:
-    default: default
-    description: "The name of the builder. Default: 'default'"
+    default: ""
+    description: "The name of the buildx builder to use. If not specified, the currently active builder is used."
 runs:
   using: 'node20'
   main: 'dist/index.js'

dist/index.js

@@ -1,7 +1,7 @@
 import { promises as fs } from 'fs';
 import path from 'path';
 import { CacheOptions, Opts, getBuilder, getCacheMap, getMountArgsString, getTargetPath } from './opts.js';
-import { run } from './run.js';
+import { run, runPiped } from './run.js';
 
 async function extractCache(cacheSource: string, cacheOptions: CacheOptions, scratchDir: string, containerImage: string, builder: string) {
     // Prepare Timestamp for Layer Cache Busting
@@ -15,19 +15,35 @@ async function extractCache(cacheSource: string, cacheOptions: CacheOptions, scr
     const mountArgs = getMountArgsString(cacheOptions);
 
     const dancefileContent = `
-FROM ${containerImage} AS dance-extract
+FROM ${containerImage}
 COPY buildstamp buildstamp
 RUN --mount=${mountArgs} \
     mkdir -p /var/dance-cache/ \
     && cp -p -R ${targetPath}/. /var/dance-cache/ || true
-FROM scratch
-COPY --from=dance-extract --chmod=u=rwX,go=rX /var/dance-cache /
 `;
     await fs.writeFile(path.join(scratchDir, 'Dancefile.extract'), dancefileContent);
     console.log(dancefileContent);
 
-    // Extract cache
-    await run('docker', ['buildx', 'build', '--builder', builder, '-f', path.join(scratchDir, 'Dancefile.extract'), '--tag', 'dance:extract', '--output', `type=local,dest=${cacheSource}`, scratchDir]);
+    // Extract Data into Docker Image
+    await run('docker', ['buildx', 'build', ...(builder ? ['--builder', builder] : []), '-f', path.join(scratchDir, 'Dancefile.extract'), '--tag', 'dance:extract', '--load', scratchDir]);
+
+    // Create Extraction Image
+    try {
+        await run('docker', ['rm', '-f', 'cache-container']);
+    } catch (error) {
+        // Ignore error if container does not exist
+    }
+    await run('docker', ['create', '-ti', '--name', 'cache-container', 'dance:extract']);
+
+    // Unpack Docker Image into Scratch
+    await runPiped(
+        ['docker', ['cp', '-L', 'cache-container:/var/dance-cache', '-']],
+        ['tar', ['-H', 'posix', '-x', '-C', scratchDir]]
+    );
+
+    // Move Cache into Its Place
+    await run('sudo', ['rm', '-rf', cacheSource]);
+    await fs.rename(path.join(scratchDir, 'dance-cache'), cacheSource);
 }
 
 export async function extractCaches(opts: Opts) {

dist/index.js.map

@@ -39,8 +39,7 @@ RUN --mount=${mountArgs} \
     console.log(dancefileContent);
 
     // Inject Data into Docker Cache
-    await run('docker', ['buildx', 'build', '--builder', builder ,'-f', path.join(scratchDir, 'Dancefile.inject'), '--tag', 'dance:inject', cacheSource]);
-
+    await run('docker', ['buildx', 'build', ...(builder ? ['--builder', builder] : []), '-f', path.join(scratchDir, 'Dancefile.inject'), '--tag', 'dance:inject', cacheSource]);    
     // Clean Directories
     try {
         await fs.rm(cacheSource, { recursive: true, force: true });

src/extract-cache.ts

@@ -29,7 +29,7 @@ export function parseOpts(args: string[]): mri.Argv<Opts> {
       "skip-extraction": (getInput("skip-extraction") || "false") === "true",
       "extract": process.env[`STATE_POST`] !== undefined,
       "utility-image": getInput("utility-image") || "ghcr.io/containerd/busybox:latest",
-      "builder": getInput("builder") || "default",
+      "builder": getInput("builder"),
       "help": false,
     },
     string: ["cache-map", "dockerfile", "cache-dir", "scratch-dir", "cache-source", "cache-target", "utility-image", "builder"],
@@ -184,5 +184,5 @@ export function getMountArgsString(cacheOptions: CacheOptions): string {
 }
 
 export function getBuilder(opts: Opts): string {
-    return opts["builder"] == null || opts["builder"] == "" ? "default" : opts["builder"];
+    return opts["builder"] ?? "";
 }

src/inject-cache.ts

@@ -15,7 +15,7 @@ test('parseOpts with no arguments', () => {
         "h": false,
         "help": false,
         "utility-image": "ghcr.io/containerd/busybox:latest",
-        "builder": "default"
+        "builder": ""
     })
 })
 
@@ -32,7 +32,7 @@ test('parseOpts with cache-map argument', () => {
         "h": false,
         "help": false,
         "utility-image": "ghcr.io/containerd/busybox:latest",
-        "builder": "default"
+        "builder": ""
     })
 })
 
@@ -51,7 +51,7 @@ test('parseOpts with deprecated cache-source and cache-target arguments', () =>
         "cache-source": 'source',
         "cache-target": 'target',
         "utility-image": "ghcr.io/containerd/busybox:latest",
-        "builder": "default"
+        "builder": ""
     })
 })
 
@@ -68,7 +68,7 @@ test('parseOpts with utility-image argument', () => {
         "h": false,
         "help": false,
         "utility-image": "alpine:1",
-        "builder": "default"
+        "builder": ""
     })
 })
 
@@ -102,7 +102,7 @@ test('parseOpts with dockerfile argument', () => {
         "h": false,
         "help": false,
         "utility-image": "ghcr.io/containerd/busybox:latest",
-        "builder": "default"
+        "builder": ""
     })
 })
 
@@ -119,7 +119,7 @@ test('parseOpts with cache-dir argument', () => {
         "h": false,
         "help": false,
         "utility-image": "ghcr.io/containerd/busybox:latest",
-        "builder": "default"
+        "builder": ""
     })
 })
 
@@ -136,7 +136,7 @@ test('parseOpts with help argument', () => {
         "h": true,
         "help": true,
         "utility-image": "ghcr.io/containerd/busybox:latest",
-        "builder": "default"
+        "builder": ""
     })
 })