@git.zone/tsdocker 1.2.43 → 1.4.0

package/ts/tsdocker.config.ts

@@ -1,14 +1,12 @@
-import * as plugins from './tsdocker.plugins';
-import * as paths from './tsdocker.paths';
+import * as plugins from './tsdocker.plugins.js';
+import * as paths from './tsdocker.paths.js';
 import * as fs from 'fs';
+import type { ITsDockerConfig } from './interfaces/index.js';
 
-export interface IConfig {
-  baseImage: string;
-  command: string;
-  dockerSock: boolean;
+// Re-export ITsDockerConfig as IConfig for backward compatibility
+export type IConfig = ITsDockerConfig & {
   exitCode?: number;
-  keyValueObject: {[key: string]: any};
-}
+};
 
 const getQenvKeyValueObject = async () => {
   let qenvKeyValueObjectArray: { [key: string]: string | number };
@@ -22,12 +20,21 @@ const getQenvKeyValueObject = async () => {
 
 const buildConfig = async (qenvKeyValueObjectArg: { [key: string]: string | number }) => {
   const npmextra = new plugins.npmextra.Npmextra(paths.cwd);
-  const config = npmextra.dataFor<IConfig>('npmdocker', {
+  const config = npmextra.dataFor<IConfig>('@git.zone/tsdocker', {
+    // Legacy options (backward compatible)
     baseImage: 'hosttoday/ht-docker-node:npmdocker',
     init: 'rm -rf node_nodules/ && yarn install',
     command: 'npmci npm test',
     dockerSock: false,
-    keyValueObject: qenvKeyValueObjectArg
+    keyValueObject: qenvKeyValueObjectArg,
+
+    // New Docker build options
+    registries: [],
+    registryRepoMap: {},
+    buildArgEnvMap: {},
+    platforms: ['linux/amd64'],
+    push: false,
+    testDir: undefined,
   });
   return config;
 };

package/ts/tsdocker.docker.ts

@@ -1,15 +1,15 @@
-import * as plugins from './tsdocker.plugins';
-import * as paths from './tsdocker.paths';
-import * as snippets from './tsdocker.snippets';
+import * as plugins from './tsdocker.plugins.js';
+import * as paths from './tsdocker.paths.js';
+import * as snippets from './tsdocker.snippets.js';
 
-import { logger, ora } from './tsdocker.logging';
+import { logger, ora } from './tsdocker.logging.js';
 
 const smartshellInstance = new plugins.smartshell.Smartshell({
   executor: 'bash'
 });
 
 // interfaces
-import { IConfig } from './tsdocker.config';
+import type { IConfig } from './tsdocker.config.js';
 
 let config: IConfig;
 
@@ -67,7 +67,7 @@ const buildDockerImage = async () => {
   await smartshellInstance.exec(`docker pull ${config.baseImage}`);
   ora.text('building Dockerimage...');
   const execResult = await smartshellInstance.execSilent(
-    `docker build -f npmdocker -t ${dockerData.imageTag} ${paths.cwd}`
+    `docker build --load -f npmdocker -t ${dockerData.imageTag} ${paths.cwd}`
   );
   if (execResult.exitCode !== 0) {
     console.log(execResult.stdout);

package/ts/tsdocker.logging.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tsdocker.plugins';
+import * as plugins from './tsdocker.plugins.js';
 
 export const logger = new plugins.smartlog.Smartlog({
   logContext: {

package/ts/tsdocker.paths.ts

@@ -1,5 +1,10 @@
-import * as plugins from './tsdocker.plugins';
+import * as plugins from './tsdocker.plugins.js';
 import * as fs from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 // directories
 export let cwd = process.cwd();

package/ts/tsdocker.plugins.ts

@@ -1,4 +1,5 @@
 // push.rocks scope
+import * as lik from '@push.rocks/lik';
 import * as npmextra from '@push.rocks/npmextra';
 import * as path from 'path';
 import * as projectinfo from '@push.rocks/projectinfo';
@@ -17,6 +18,7 @@ import * as smartstring from '@push.rocks/smartstring';
 export const smartfs = new SmartFs(new SmartFsProviderNode());
 
 export {
+  lik,
   npmextra,
   path,
   projectinfo,

package/ts/tsdocker.snippets.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tsdocker.plugins';
+import * as plugins from './tsdocker.plugins.js';
 
 export interface IDockerfileSnippet {
   baseImage: string;
@@ -14,23 +14,20 @@ let getMountSolutionString = (optionsArg: IDockerfileSnippet) => {
 };
 
 let getGlobalPreparationString = (optionsArg: IDockerfileSnippet) => {
-  if (optionsArg.baseImage !== 'hosttoday/ht-docker-node:npmdocker') {
-    return 'RUN npm install -g npmdocker';
-  } else {
-    return '# not installing npmdocker since it is included in the base image';
-  }
+  // Always install tsdocker to ensure the latest version is available
+  return 'RUN npm install -g @git.zone/tsdocker';
 };
 
 export let dockerfileSnippet = (optionsArg: IDockerfileSnippet): string => {
   return plugins.smartstring.indent.normalize(
     `
 FROM ${optionsArg.baseImage}
-# For info about what npmdocker does read the docs at https://gitzone.github.io/npmdocker
+# For info about what tsdocker does read the docs at https://gitzone.github.io/tsdocker
 ${getGlobalPreparationString(optionsArg)}
 ${getMountSolutionString(optionsArg)}
 WORKDIR /workspace
 ENV CI=true
-ENTRYPOINT ["npmdocker"]
+ENTRYPOINT ["tsdocker"]
 CMD ["runinside"]
 `
   );