devcontainers#299 Make cacheTo available to devcontainer up and m…

…ake it independant of `noCache`
sebst · Sep 3, 2024 · d29f481 · d29f481
1 parent ef79e83
commit d29f481
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/common/src/dev-container-cli.ts b/common/src/dev-container-cli.ts
@@ -195,11 +195,11 @@ async function devContainerBuild(
     args.additionalCacheFroms.forEach(cacheFrom =>
       commandArgs.push('--cache-from', cacheFrom),
     );
-    if (args.cacheTo) {
-      args.cacheTo.forEach(cacheTo =>
-        commandArgs.push('--cache-to', cacheTo),
-      );
-    }
+  }
+  if (args.cacheTo) {
+    args.cacheTo.forEach(cacheTo =>
+      commandArgs.push('--cache-to', cacheTo),
+    );
   }
   return await runSpecCliJsonCommand<DevContainerCliBuildResult>({
     args: commandArgs,
@@ -217,6 +217,7 @@ export interface DevContainerCliUpArgs {
   workspaceFolder: string;
   configFile: string | undefined;
   additionalCacheFroms?: string[];
+  cacheTo?: string[];
   skipContainerUserIdUpdate?: boolean;
   env?: string[];
   userDataFolder?: string;
@@ -241,6 +242,11 @@ async function devContainerUp(
       commandArgs.push('--cache-from', cacheFrom),
     );
   }
+  if (args.cacheTo) {
+    args.cacheTo.forEach(cacheTo =>
+      commandArgs.push('--cache-to', cacheTo),
+    );
+  }
   if (args.userDataFolder) {
     commandArgs.push("--user-data-folder", args.userDataFolder);
   }

diff --git a/common/src/docker.ts b/common/src/docker.ts
@@ -89,7 +89,9 @@ async function buildImageBase(
 	}
 	cacheFrom.forEach(cacheValue => args.push('--cache-from', cacheValue));
 	if (cacheTo) {
-		cacheTo.forEach(cacheValue => args.push('--cache-to', cacheValue));
+		coerceToArray(cacheTo).forEach(cacheValue =>
+			args.push('--cache-to', cacheValue),
+		);
 	} else {
 		args.push('--cache-to');
 		args.push('type=inline');