fix: clear command when entrypoint is tweaked

Signed-off-by: David Kwon <[email protected]>
eclipse-che · May 2, 2022 · 7444312 · 7444312
1 parent 39511b7
commit 7444312
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/tools/devworkspace-handler/src/devfile/dev-container-component-updater.ts b/tools/devworkspace-handler/src/devfile/dev-container-component-updater.ts
@@ -93,6 +93,7 @@ export class DevContainerComponentUpdater {
 
     // need to tweak the entrypoint to call the ${PLUGIN_REMOTE_ENDPOINT_EXECUTABLE}
     devContainer.args = ['sh', '-c', '${PLUGIN_REMOTE_ENDPOINT_EXECUTABLE}'];
+    devContainer.command = [];
 
     // now, need to add the common stuff
     this.containerPluginRemoteUpdater.update(devContainerComponent.name, devContainer);

diff --git a/tools/devworkspace-handler/tests/devfile/dev-container-component-updater.spec.ts b/tools/devworkspace-handler/tests/devfile/dev-container-component-updater.spec.ts
@@ -78,6 +78,7 @@ describe('Test DevContainerComponentUpdater', () => {
             path: '/existing',
           },
         ],
+        command: [ 'tail' ],
       },
     };
     devContainerComponentFinderFindMethod.mockResolvedValue(devContainerComponent);
@@ -138,6 +139,7 @@ describe('Test DevContainerComponentUpdater', () => {
     ]);
     // args updated
     expect(devContainerComponent?.container?.args).toStrictEqual(['sh', '-c', '${PLUGIN_REMOTE_ENDPOINT_EXECUTABLE}']);
+    expect(devContainerComponent?.container?.command).toEqual([]);
 
     // check we have a new volume added
     const components = devfileContext.devWorkspace.spec?.template?.components || [];