getlocalci · kienstra · Nov 28, 2022 · Nov 27, 2022 · Nov 27, 2022 · Nov 27, 2022
diff --git a/src/command/ExitAllJobs.ts b/src/command/ExitAllJobs.ts
@@ -2,16 +2,16 @@ import { inject, injectable } from 'inversify';
 import type vscode from 'vscode';
 import type { Command } from '.';
 import Types from 'common/Types';
-import CommittedImages from 'containerization/CommittedImages';
+import Images from 'containerization/Images';
 import EditorGateway from 'gateway/EditorGateway';
 import JobProvider from 'job/JobProvider';
 import ReporterGateway from 'gateway/ReporterGateway';
 import { COMMITTED_IMAGE_NAMESPACE, JOB_TREE_VIEW_ID } from 'constant';
 
 @injectable()
 export default class ExitAllJobs implements Command {
-  @inject(CommittedImages)
-  committedImages!: CommittedImages;
+  @inject(Images)
+  images!: Images;
 
   @inject(Types.IEditorGateway)
   editorGateway!: EditorGateway;
@@ -47,7 +47,7 @@ export default class ExitAllJobs implements Command {
             terminal.dispose();
           });
 
-        this.committedImages.cleanUp(`${COMMITTED_IMAGE_NAMESPACE}/*`);
+        this.images.cleanUp(`${COMMITTED_IMAGE_NAMESPACE}/*`);
       }
     };
   }

diff --git a/src/command/SelectRepo.ts b/src/command/SelectRepo.ts
@@ -3,7 +3,7 @@ import type vscode from 'vscode';
 import type { Command } from '.';
 import Types from 'common/Types';
 import AllConfigFiles from 'config/AllConfigFiles';
-import CommittedImages from 'containerization/CommittedImages';
+import Images from 'containerization/Images';
 import EditorGateway from 'gateway/EditorGateway';
 import getRepoBasename from 'common/getRepoBasename';
 import JobProvider from 'job/JobProvider';
@@ -19,8 +19,8 @@ export default class SelectRepo implements Command {
   @inject(AllConfigFiles)
   allConfigFiles!: AllConfigFiles;
 
-  @inject(CommittedImages)
-  committedImages!: CommittedImages;
+  @inject(Images)
+  images!: Images;
 
   @inject(Types.IEditorGateway)
   editorGateway!: EditorGateway;

diff --git a/src/common/BaseIoc.ts b/src/common/BaseIoc.ts
@@ -3,7 +3,7 @@ import AllConfigFiles from 'config/AllConfigFiles';
 import AllJobs from 'job/AllJobs';
 import BuildAgentSettings from 'config/BuildAgentSettings';
 import Children from 'job/Children';
-import CommittedImages from 'containerization/CommittedImages';
+import Images from 'containerization/Images';
 import CommandFactory from 'job/ComandFactory';
 import Config from 'config/Config';
 import ConfigFile from 'config/ConfigFile';
@@ -70,7 +70,7 @@ export default class BaseIoc {
     this.container.bind(BuildAgentSettings).toSelf();
     this.container.bind(Children).toSelf();
     this.container.bind(CommandFactory).toSelf();
-    this.container.bind(CommittedImages).toSelf();
+    this.container.bind(Images).toSelf();
     this.container.bind(Config).toSelf();
     this.container.bind(ConfigFile).toSelf();
     this.container.bind(CreateConfigFile).toSelf();

diff --git a/src/containerization/CommittedImages.ts → src/containerization/Images.ts b/src/containerization/CommittedImages.ts → src/containerization/Images.ts
@@ -2,10 +2,10 @@ import { inject, injectable } from 'inversify';
 import ChildProcessGateway from 'gateway/ChildProcessGateway';
 import Spawn from 'common/Spawn';
 import Types from 'common/Types';
-import { cleanUpCommittedImages } from 'script';
+import { cleanUpImages } from 'script';
 
 @injectable()
-export default class CommittedImages {
+export default class Images {
   @inject(Types.IChildProcessGateway)
   childProcessGateway!: ChildProcessGateway;
 
@@ -19,7 +19,7 @@ export default class CommittedImages {
         '-c',
         `lci_image_pattern=${imagePattern}
         lci_image_to_exclude=${imageIdToExclude}
-        ${cleanUpCommittedImages}`,
+        ${cleanUpImages}`,
       ],
       this.spawn.getOptions()
     );

diff --git a/...ainerization/test/CommittedImages.spec.ts → src/containerization/test/Images.spec.ts b/...ainerization/test/CommittedImages.spec.ts → src/containerization/test/Images.spec.ts
@@ -1,24 +1,24 @@
 import AppTestHarness from 'test-tool/helper/AppTestHarness';
-import CommittedImages from 'containerization/CommittedImages';
+import Images from 'containerization/Images';
 import FakeChildProcessGateway from 'gateway/FakeChildProcessGateway';
 
 let childProcessGateway: FakeChildProcessGateway;
-let committedImages: CommittedImages;
+let images: Images;
 let testHarness: AppTestHarness;
 
-describe('CommittedImages', () => {
+describe('Images', () => {
   beforeEach(() => {
     testHarness = new AppTestHarness();
     testHarness.init();
-    committedImages = testHarness.container.get(CommittedImages);
+    images = testHarness.container.get(Images);
     childProcessGateway = testHarness.childProcessGateway;
   });
 
   test('no error', () => {
     const spawnSpy = jest.fn();
     childProcessGateway.cp.spawn = spawnSpy;
 
-    committedImages.cleanUp('local-ci-lint');
+    images.cleanUp('local-ci/lint');
     expect(spawnSpy).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/job/JobListener.ts b/src/job/JobListener.ts
@@ -2,6 +2,7 @@ import { inject, injectable } from 'inversify';
 import type vscode from 'vscode';
 import Types from 'common/Types';
 import ChildProcessGateway from 'gateway/ChildProcessGateway';
+import Images from 'containerization/Images';
 import ConfigFile from 'config/ConfigFile';
 import EditorGateway from 'gateway/EditorGateway';
 import FsGateway from 'gateway/FsGateway';
@@ -11,14 +12,20 @@ import JobTreeItem from 'job/JobTreeItem';
 import LogFile from 'log/LogFile';
 import ParsedConfig from 'config/ParsedConfig';
 import Spawn from 'common/Spawn';
-import { SUPPRESS_JOB_COMPLETE_MESSAGE } from 'constant';
+import {
+  COMMITTED_IMAGE_NAMESPACE,
+  SUPPRESS_JOB_COMPLETE_MESSAGE,
+} from 'constant';
 import { getPicardContainerFunction } from 'script';
 
 @injectable()
 export default class JobListener {
   @inject(Types.IChildProcessGateway)
   childProcessGateway!: ChildProcessGateway;
 
+  @inject(Images)
+  images!: Images;
+
   @inject(ConfigFile)
   configFile!: ConfigFile;
 
@@ -187,6 +194,29 @@ export default class JobListener {
             });
         }
       });
+
+      if (output?.toLowerCase()?.includes('no space left on device')) {
+        this.images.cleanUp(`${COMMITTED_IMAGE_NAMESPACE}/*`);
+        this.images.cleanUp('circleci/*');
+        this.images.cleanUp('cimg/*');
+
+        const warningMessage = 'No space left on device';
+        const fixText = 'Fix by removing all stopped containers';
+        const clicked =
+          await this.editorGateway.editor.window.showWarningMessage(
+            warningMessage,
+            { detail: 'Docker probably needs more space' },
+            fixText
+          );
+
+        if (clicked === fixText) {
+          this.childProcessGateway.cp.spawn(
+            '/bin/sh',
+            ['-c', `docker container prune -f`],
+            this.spawn.getOptions()
+          );
+        }
+      }
     });
 
     return process;

diff --git a/src/job/JobRunner.ts b/src/job/JobRunner.ts
@@ -4,7 +4,7 @@ import type vscode from 'vscode';
 import { getBinaryPath } from '../../node/binary';
 import areTerminalsClosed from 'terminal/areTerminalsClosed';
 import BuildAgentSettings from 'config/BuildAgentSettings';
-import CommittedImages from 'containerization/CommittedImages';
+import Images from 'containerization/Images';
 import ConfigFile from 'config/ConfigFile';
 import EditorGateway from 'gateway/EditorGateway';
 import FinalTerminal from 'terminal/FinalTerminal';
@@ -43,8 +43,8 @@ export default class JobRunner {
   @inject(BuildAgentSettings)
   buildAgentSettings!: BuildAgentSettings;
 
-  @inject(CommittedImages)
-  committedImages!: CommittedImages;
+  @inject(Images)
+  images!: Images;
 
   @inject(ConfigFile)
   configFile!: ConfigFile;
@@ -254,7 +254,7 @@ export default class JobRunner {
     this.editorGateway.editor.window.onDidCloseTerminal(() => {
       if (areTerminalsClosed(terminal, debuggingTerminal, finalTerminal)) {
         listeningProcess.kill();
-        this.committedImages.cleanUp(committedImageRepo);
+        this.images.cleanUp(committedImageRepo);
       }
     });
   }

diff --git a/src/license/LicensePresenter.ts b/src/license/LicensePresenter.ts
@@ -43,7 +43,7 @@ export default class LicensePresenter {
 
     const shouldOfferInterview = isTrialExpired(
       previewStartedTimeStamp,
-      trialLengthInMilliseconds + 5 * DAY_IN_MILLISECONDS
+      trialLengthInMilliseconds + 40 * DAY_IN_MILLISECONDS
     );
 
     if (isValid) {

diff --git a/src/process/Persistence.ts b/src/process/Persistence.ts
@@ -234,8 +234,7 @@ export default class Persistence {
       if (
         typeof step !== 'string' &&
         typeof step?.run !== 'string' &&
-        step?.run?.environment &&
-        step?.run?.environment['OUTPUT_PATH']
+        step?.run?.environment?.['OUTPUT_PATH']
       ) {
         return step?.run?.environment['OUTPUT_PATH'];
       }

diff --git a/src/script/cleanUpCommittedImages.sh → src/script/cleanUpImages.sh b/src/script/cleanUpCommittedImages.sh → src/script/cleanUpImages.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # shellcheck disable=SC2154
-lci_images=$(docker images -q "$lci_image_pattern")
+lci_images=$(docker images -q --filter=reference="$lci_image_pattern")
 echo "$lci_images" | while read -r image
   do
   if [ ! "$image" ] || [ "$lci_image_to_exclude" = "$image" ]

diff --git a/src/script/index.ts b/src/script/index.ts
@@ -1,5 +1,5 @@
 import scriptAddEnvVars from './addEnvVars.sh';
-import scriptCleanUpCommittedImages from './cleanUpCommittedImages.sh';
+import scriptCleanUpImages from './cleanUpImages.sh';
 import scriptCommitContainer from './commitContainer.sh';
 import scriptDockerExecRunningContainer from './dockerExecRunningContainer.sh';
 import scriptGetPicardContainerFunction from './getPicardContainerFunction.sh';
@@ -15,9 +15,7 @@ function stripDevSyntax(file: string) {
 }
 
 export const addEnvVars = stripDevSyntax(scriptAddEnvVars);
-export const cleanUpCommittedImages = stripDevSyntax(
-  scriptCleanUpCommittedImages
-);
+export const cleanUpImages = stripDevSyntax(scriptCleanUpImages);
 export const commitContainer = stripDevSyntax(scriptCommitContainer);
 export const dockerExecRunningContainer = stripDevSyntax(
   scriptDockerExecRunningContainer