@git.zone/tsdocker 1.17.4 → 2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/interfaces/index.d.ts +0 -7
- package/dist_ts/tsdocker.cli.js +62 -37
- package/dist_ts/tsdocker.config.d.ts +1 -4
- package/dist_ts/tsdocker.config.js +3 -22
- package/dist_ts/tsdocker.paths.d.ts +0 -1
- package/dist_ts/tsdocker.paths.js +1 -2
- package/dist_ts/tsdocker.plugins.d.ts +1 -5
- package/dist_ts/tsdocker.plugins.js +2 -6
- package/package.json +2 -14
- package/readme.hints.md +1 -10
- package/readme.md +163 -78
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/interfaces/index.ts +0 -8
- package/ts/tsdocker.cli.ts +62 -42
- package/ts/tsdocker.config.ts +4 -29
- package/ts/tsdocker.paths.ts +0 -1
- package/ts/tsdocker.plugins.ts +0 -8
- package/assets/Dockerfile +0 -6
- package/dist_ts/tsdocker.docker.d.ts +0 -2
- package/dist_ts/tsdocker.docker.js +0 -145
- package/dist_ts/tsdocker.snippets.d.ts +0 -5
- package/dist_ts/tsdocker.snippets.js +0 -26
- package/ts/tsdocker.docker.ts +0 -169
- package/ts/tsdocker.snippets.ts +0 -34
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tsdocker',
|
|
6
|
-
version: '
|
|
6
|
+
version: '2.0.2',
|
|
7
7
|
description: 'develop npm modules cross platform with docker'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGdEQUFnRDtDQUM5RCxDQUFBIn0=
|
|
@@ -1,14 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Configuration interface for tsdocker
|
|
3
|
-
* Extends legacy config with new Docker build capabilities
|
|
4
3
|
*/
|
|
5
4
|
export interface ITsDockerConfig {
|
|
6
|
-
baseImage: string;
|
|
7
|
-
command: string;
|
|
8
|
-
dockerSock: boolean;
|
|
9
|
-
keyValueObject: {
|
|
10
|
-
[key: string]: any;
|
|
11
|
-
};
|
|
12
5
|
registries?: string[];
|
|
13
6
|
registryRepoMap?: {
|
|
14
7
|
[registry: string]: string;
|
package/dist_ts/tsdocker.cli.js
CHANGED
|
@@ -2,24 +2,74 @@ import * as plugins from './tsdocker.plugins.js';
|
|
|
2
2
|
import * as paths from './tsdocker.paths.js';
|
|
3
3
|
// modules
|
|
4
4
|
import * as ConfigModule from './tsdocker.config.js';
|
|
5
|
-
import * as DockerModule from './tsdocker.docker.js';
|
|
6
5
|
import { logger, ora } from './tsdocker.logging.js';
|
|
7
6
|
import { TsDockerManager } from './classes.tsdockermanager.js';
|
|
8
7
|
import { DockerContext } from './classes.dockercontext.js';
|
|
9
8
|
import { commitinfo } from './00_commitinfo_data.js';
|
|
10
9
|
const tsdockerCli = new plugins.smartcli.Smartcli();
|
|
11
10
|
tsdockerCli.addVersion(commitinfo.version);
|
|
11
|
+
const printManPage = () => {
|
|
12
|
+
const manPage = `
|
|
13
|
+
TSDOCKER(1) User Commands TSDOCKER(1)
|
|
14
|
+
|
|
15
|
+
NAME
|
|
16
|
+
tsdocker - build, test, and push Docker images
|
|
17
|
+
|
|
18
|
+
VERSION
|
|
19
|
+
${commitinfo.version}
|
|
20
|
+
|
|
21
|
+
SYNOPSIS
|
|
22
|
+
tsdocker <command> [options]
|
|
23
|
+
|
|
24
|
+
COMMANDS
|
|
25
|
+
build [patterns...] [flags] Build Dockerfiles in dependency order
|
|
26
|
+
push [patterns...] [flags] Build and push images to registries
|
|
27
|
+
pull <registry-url> Pull images from a registry
|
|
28
|
+
test [flags] Build and run container test scripts
|
|
29
|
+
login Authenticate with configured registries
|
|
30
|
+
list List discovered Dockerfiles
|
|
31
|
+
clean [-y] [--all] Interactive Docker resource cleanup
|
|
32
|
+
|
|
33
|
+
BUILD / PUSH OPTIONS
|
|
34
|
+
--platform=<p> Target platform (e.g. linux/arm64)
|
|
35
|
+
--timeout=<s> Build timeout in seconds
|
|
36
|
+
--no-cache Rebuild without Docker layer cache
|
|
37
|
+
--cached Skip builds when Dockerfile is unchanged
|
|
38
|
+
--verbose Stream raw docker build output
|
|
39
|
+
--parallel[=<n>] Parallel builds (optional concurrency limit)
|
|
40
|
+
--context=<name> Docker context to use
|
|
41
|
+
|
|
42
|
+
PUSH-ONLY OPTIONS
|
|
43
|
+
--registry=<url> Push to a specific registry
|
|
44
|
+
--no-build Push already-built images (skip build step)
|
|
45
|
+
|
|
46
|
+
CLEAN OPTIONS
|
|
47
|
+
-y Auto-confirm all prompts
|
|
48
|
+
--all Include all images and volumes (not just dangling)
|
|
49
|
+
|
|
50
|
+
CONFIGURATION
|
|
51
|
+
Configure via npmextra.json under the "@git.zone/tsdocker" key:
|
|
52
|
+
|
|
53
|
+
registries Array of registry URLs to push to
|
|
54
|
+
registryRepoMap Map of registry URL to repo path overrides
|
|
55
|
+
buildArgEnvMap Map of Docker build-arg names to env var names
|
|
56
|
+
platforms Array of target platforms (default: ["linux/amd64"])
|
|
57
|
+
push Boolean, auto-push after build
|
|
58
|
+
testDir Directory containing test_*.sh scripts
|
|
59
|
+
|
|
60
|
+
EXAMPLES
|
|
61
|
+
tsdocker build
|
|
62
|
+
tsdocker build Dockerfile_app --platform=linux/arm64
|
|
63
|
+
tsdocker push --registry=ghcr.io
|
|
64
|
+
tsdocker test --verbose
|
|
65
|
+
tsdocker clean -y --all
|
|
66
|
+
`;
|
|
67
|
+
console.log(manPage);
|
|
68
|
+
};
|
|
12
69
|
export let run = () => {
|
|
13
|
-
// Default command:
|
|
14
|
-
tsdockerCli.standardCommand().subscribe(async (
|
|
15
|
-
|
|
16
|
-
if (configArg.exitCode === 0) {
|
|
17
|
-
logger.log('success', 'container ended all right!');
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
logger.log('error', `container ended with error! Exit Code is ${configArg.exitCode}`);
|
|
21
|
-
process.exit(1);
|
|
22
|
-
}
|
|
70
|
+
// Default command: print man page
|
|
71
|
+
tsdockerCli.standardCommand().subscribe(async () => {
|
|
72
|
+
printManPage();
|
|
23
73
|
});
|
|
24
74
|
/**
|
|
25
75
|
* Build Dockerfiles in dependency order
|
|
@@ -212,23 +262,6 @@ export let run = () => {
|
|
|
212
262
|
process.exit(1);
|
|
213
263
|
}
|
|
214
264
|
});
|
|
215
|
-
/**
|
|
216
|
-
* this command is executed inside docker and meant for use from outside docker
|
|
217
|
-
*/
|
|
218
|
-
tsdockerCli.addCommand('runinside').subscribe(async (argvArg) => {
|
|
219
|
-
logger.log('ok', 'Allright. We are now in Docker!');
|
|
220
|
-
ora.text('now trying to run your specified command');
|
|
221
|
-
const configArg = await ConfigModule.run();
|
|
222
|
-
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
223
|
-
executor: 'bash'
|
|
224
|
-
});
|
|
225
|
-
ora.stop();
|
|
226
|
-
await smartshellInstance.exec(configArg.command).then(response => {
|
|
227
|
-
if (response.exitCode !== 0) {
|
|
228
|
-
process.exit(1);
|
|
229
|
-
}
|
|
230
|
-
});
|
|
231
|
-
});
|
|
232
265
|
tsdockerCli.addCommand('clean').subscribe(async (argvArg) => {
|
|
233
266
|
try {
|
|
234
267
|
const autoYes = !!argvArg.y;
|
|
@@ -373,14 +406,6 @@ export let run = () => {
|
|
|
373
406
|
process.exit(1);
|
|
374
407
|
}
|
|
375
408
|
});
|
|
376
|
-
tsdockerCli.addCommand('vscode').subscribe(async (argvArg) => {
|
|
377
|
-
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
378
|
-
executor: 'bash'
|
|
379
|
-
});
|
|
380
|
-
logger.log('ok', `Starting vscode in cwd ${paths.cwd}`);
|
|
381
|
-
await smartshellInstance.execAndWaitForLine(`docker run -p 127.0.0.1:8443:8443 -v "${paths.cwd}:/home/coder/project" registry.gitlab.com/hosttoday/ht-docker-vscode --allow-http --no-auth`, /Connected to shared process/);
|
|
382
|
-
await plugins.smartopen.openUrl('testing-vscode.git.zone:8443');
|
|
383
|
-
});
|
|
384
409
|
tsdockerCli.startParse();
|
|
385
410
|
};
|
|
386
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tsdocker.cli.js","sourceRoot":"","sources":["../ts/tsdocker.cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAE7C,UAAU;AACV,OAAO,KAAK,YAAY,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,YAAY,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACpD,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAE3C,MAAM,CAAC,IAAI,GAAG,GAAG,GAAG,EAAE;IACpB,4DAA4D;IAC5D,WAAW,CAAC,eAAe,EAAE,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACtD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,SAAS,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4CAA4C,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;;OAGG;IACH,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACxD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAC;YAE7D,MAAM,YAAY,GAAyB,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAa,CAAC;YAChD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACnC,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAkB,CAAC;YACrD,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC5B,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;YAC7B,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;gBAC7B,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACzC,YAAY,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC;gBACtD,CAAC;YACH,CAAC;YAED,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAClC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAkB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;;OAGG;IACH,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACvD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAC;YAE7D,cAAc;YACd,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YAEtB,qDAAqD;YACrD,MAAM,YAAY,GAAyB,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAa,CAAC;YAChD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACnC,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAkB,CAAC;YACrD,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC5B,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;gBAC7B,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACzC,YAAY,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC;gBACtD,CAAC;YACH,CAAC;YAED,+CAA+C;YAC/C,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC5B,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC;gBACpC,IAAI,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;oBAClC,OAAO,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACpC,CAAC;YAED,oCAAoC;YACpC,MAAM,WAAW,GAAG,OAAO,CAAC,QAA8B,CAAC;YAC3D,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE3D,MAAM,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAiB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACvD,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,0CAA0C;YAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4DAA4D,CAAC,CAAC;gBAClF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAC;YAE7D,cAAc;YACd,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YAEtB,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAiB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACvD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAC;YAE7D,qBAAqB;YACrB,MAAM,YAAY,GAAyB,EAAE,CAAC;YAC9C,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC5B,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;YAC7B,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;gBAC7B,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACzC,YAAY,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC;gBACtD,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAElC,YAAY;YACZ,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAkB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACxD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAC;YAC7D,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAkB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACvD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAC;YAC7D,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAiB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QAC5D,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,iCAAiC,CAAC,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC;QAC3C,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;YAC3D,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/D,IAAI,QAAQ,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACxD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;YAEjC,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YACnF,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;YAE3D,mCAAmC;YACnC,GAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACxC,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,OAAiB,CAAC,CAAC;YACtD,CAAC;YACD,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC;YAC7B,GAAG,CAAC,IAAI,EAAE,CAAC;YACX,aAAa,CAAC,cAAc,EAAE,CAAC;YAQ/B,MAAM,aAAa,GAAG,KAAK,EAAE,OAAe,EAA8B,EAAE;gBAC1E,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBACnD,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC/B,OAAO;wBACL,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;wBACZ,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;qBAC7B,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,qCAAqC;YACrC,MAAM,eAAe,GAAG,KAAK,EAC3B,IAAY,EACZ,OAAe,EACf,SAA4B,EACT,EAAE;gBACrB,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACpC,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC;oBACxC,IAAI;oBACJ,IAAI,EAAE,UAAU;oBAChB,OAAO;oBACP,OAAO,EAAE,EAAE;oBACX,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;iBAClE,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAiB,CAAC;YAClC,CAAC,CAAC;YAEF,iCAAiC;YACjC,MAAM,aAAa,GAAG,KAAK,EACzB,IAAY,EACZ,OAAe,EACG,EAAE;gBACpB,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC;oBACxC,IAAI;oBACJ,IAAI,EAAE,SAAS;oBACf,OAAO;oBACP,OAAO,EAAE,KAAK;iBACf,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAgB,CAAC;YACjC,CAAC,CAAC;YAEF,6BAA6B;YAC7B,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAC3C,mEAAmE,CACpE,CAAC;YACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,iBAAiB,CAAC,MAAM,uBAAuB,CAAC,CAAC;gBAC7E,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,mBAAmB,EACnB,oCAAoC,EACpC,iBAAiB,CAClB,CAAC;gBACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,WAAW,CAAC,MAAM,kBAAkB,CAAC,CAAC;oBACpE,MAAM,kBAAkB,CAAC,IAAI,CAAC,eAAe,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;YACpD,CAAC;YAED,6BAA6B;YAC7B,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAC3C,qHAAqH,CACtH,CAAC;YACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,iBAAiB,CAAC,MAAM,uBAAuB,CAAC,CAAC;gBAC7E,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,mBAAmB,EACnB,sCAAsC,EACtC,iBAAiB,CAClB,CAAC;gBACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,WAAW,CAAC,MAAM,kBAAkB,CAAC,CAAC;oBACrE,MAAM,kBAAkB,CAAC,IAAI,CAAC,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;YACpD,CAAC;YAED,0BAA0B;YAC1B,MAAM,cAAc,GAAG,MAAM,aAAa,CACxC,wFAAwF,CACzF,CAAC;YACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,MAAM,SAAS,GAAG,MAAM,aAAa,CACnC,sBAAsB,EACtB,UAAU,cAAc,CAAC,MAAM,qBAAqB,CACrD,CAAC;gBACF,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,cAAc,CAAC,MAAM,uBAAuB,CAAC,CAAC;oBAC7E,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACtD,MAAM,kBAAkB,CAAC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;gBACrD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;YACjD,CAAC;YAED,uCAAuC;YACvC,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,SAAS,GAAG,MAAM,aAAa,CACnC,uEAAuE,CACxE,CAAC;gBACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,SAAS,CAAC,MAAM,iBAAiB,CAAC,CAAC;oBAC/D,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,WAAW,EACX,0BAA0B,EAC1B,SAAS,CACV,CAAC;oBACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,WAAW,CAAC,MAAM,cAAc,CAAC,CAAC;wBACjE,MAAM,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAC1E,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;YAED,2BAA2B;YAC3B,MAAM,eAAe,GAAG,MAAM,aAAa,CACzC,qEAAqE,CACtE,CAAC;YACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,SAAS,GAAG,MAAM,aAAa,CACnC,uBAAuB,EACvB,UAAU,eAAe,CAAC,MAAM,sBAAsB,CACvD,CAAC;gBACF,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,eAAe,CAAC,MAAM,wBAAwB,CAAC,CAAC;oBAC/E,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACzD,MAAM,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;YAClD,CAAC;YAED,wCAAwC;YACxC,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,UAAU,GAAG,MAAM,aAAa,CACpC,oDAAoD,CACrD,CAAC;gBACF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,MAAM,kBAAkB,CAAC,CAAC;oBACjE,MAAM,WAAW,GAAG,MAAM,eAAe,CACvC,YAAY,EACZ,2BAA2B,EAC3B,UAAU,CACX,CAAC;oBACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,WAAW,CAAC,MAAM,eAAe,CAAC,CAAC;wBAClE,MAAM,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAC7E,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAkB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACzD,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;YAC3D,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,0BAA0B,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QACxD,MAAM,kBAAkB,CAAC,kBAAkB,CACzC,yCACE,KAAK,CAAC,GACR,6FAA6F,EAC7F,6BAA6B,CAC9B,CAAC;QACF,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,WAAW,CAAC,UAAU,EAAE,CAAC;AAC3B,CAAC,CAAC"}
|
|
411
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tsdocker.cli.js","sourceRoot":"","sources":["../ts/tsdocker.cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,8 @@
|
|
|
1
1
|
import * as plugins from './tsdocker.plugins.js';
|
|
2
2
|
import * as paths from './tsdocker.paths.js';
|
|
3
|
-
|
|
4
|
-
const getQenvKeyValueObject = async () => {
|
|
5
|
-
let qenvKeyValueObjectArray;
|
|
6
|
-
if (fs.existsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
|
|
7
|
-
qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObject;
|
|
8
|
-
}
|
|
9
|
-
else {
|
|
10
|
-
qenvKeyValueObjectArray = {};
|
|
11
|
-
}
|
|
12
|
-
return qenvKeyValueObjectArray;
|
|
13
|
-
};
|
|
14
|
-
const buildConfig = async (qenvKeyValueObjectArg) => {
|
|
3
|
+
const buildConfig = async () => {
|
|
15
4
|
const npmextra = new plugins.npmextra.Npmextra(paths.cwd);
|
|
16
5
|
const config = npmextra.dataFor('@git.zone/tsdocker', {
|
|
17
|
-
// Legacy options (backward compatible)
|
|
18
|
-
baseImage: 'hosttoday/ht-docker-node:npmdocker',
|
|
19
|
-
init: 'rm -rf node_nodules/ && yarn install',
|
|
20
|
-
command: 'npmci npm test',
|
|
21
|
-
dockerSock: false,
|
|
22
|
-
keyValueObject: qenvKeyValueObjectArg,
|
|
23
|
-
// New Docker build options
|
|
24
6
|
registries: [],
|
|
25
7
|
registryRepoMap: {},
|
|
26
8
|
buildArgEnvMap: {},
|
|
@@ -31,7 +13,6 @@ const buildConfig = async (qenvKeyValueObjectArg) => {
|
|
|
31
13
|
return config;
|
|
32
14
|
};
|
|
33
15
|
export let run = async () => {
|
|
34
|
-
|
|
35
|
-
return config;
|
|
16
|
+
return buildConfig();
|
|
36
17
|
};
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHNkb2NrZXIuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sdUJBQXVCLENBQUM7QUFDakQsT0FBTyxLQUFLLEtBQUssTUFBTSxxQkFBcUIsQ0FBQztBQUc3QyxNQUFNLFdBQVcsR0FBRyxLQUFLLElBQThCLEVBQUU7SUFDdkQsTUFBTSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUQsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBa0Isb0JBQW9CLEVBQUU7UUFDckUsVUFBVSxFQUFFLEVBQUU7UUFDZCxlQUFlLEVBQUUsRUFBRTtRQUNuQixjQUFjLEVBQUUsRUFBRTtRQUNsQixTQUFTLEVBQUUsQ0FBQyxhQUFhLENBQUM7UUFDMUIsSUFBSSxFQUFFLEtBQUs7UUFDWCxPQUFPLEVBQUUsU0FBUztLQUNuQixDQUFDLENBQUM7SUFDSCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsSUFBSSxHQUFHLEdBQUcsS0FBSyxJQUE4QixFQUFFO0lBQ3BELE9BQU8sV0FBVyxFQUFFLENBQUM7QUFDdkIsQ0FBQyxDQUFDIn0=
|
|
@@ -9,5 +9,4 @@ export let cwd = process.cwd();
|
|
|
9
9
|
export let packageBase = plugins.path.join(__dirname, '../');
|
|
10
10
|
export let assets = plugins.path.join(packageBase, 'assets/');
|
|
11
11
|
fs.mkdirSync(assets, { recursive: true });
|
|
12
|
-
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c2RvY2tlci5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFDcEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUUvQixNQUFNLFVBQVUsR0FBRyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNsRCxNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7QUFFdEMsY0FBYztBQUNkLE1BQU0sQ0FBQyxJQUFJLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDL0IsTUFBTSxDQUFDLElBQUksV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUM3RCxNQUFNLENBQUMsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQzlELEVBQUUsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7QUFDMUMsTUFBTSxDQUFDLElBQUksYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxXQUFXLENBQUMsQ0FBQyJ9
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c2RvY2tlci5wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFDcEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUUvQixNQUFNLFVBQVUsR0FBRyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNsRCxNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7QUFFdEMsY0FBYztBQUNkLE1BQU0sQ0FBQyxJQUFJLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDL0IsTUFBTSxDQUFDLElBQUksV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUM3RCxNQUFNLENBQUMsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQzlELEVBQUUsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMifQ==
|
|
@@ -2,16 +2,12 @@ import * as lik from '@push.rocks/lik';
|
|
|
2
2
|
import * as npmextra from '@push.rocks/npmextra';
|
|
3
3
|
import * as path from 'path';
|
|
4
4
|
import * as projectinfo from '@push.rocks/projectinfo';
|
|
5
|
-
import * as smartpromise from '@push.rocks/smartpromise';
|
|
6
|
-
import * as qenv from '@push.rocks/qenv';
|
|
7
5
|
import * as smartcli from '@push.rocks/smartcli';
|
|
8
6
|
import { SmartFs } from '@push.rocks/smartfs';
|
|
9
7
|
import * as smartlog from '@push.rocks/smartlog';
|
|
10
8
|
import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
|
|
11
9
|
import * as smartlogSouceOra from '@push.rocks/smartlog-source-ora';
|
|
12
|
-
import * as smartopen from '@push.rocks/smartopen';
|
|
13
10
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
14
11
|
import * as smartshell from '@push.rocks/smartshell';
|
|
15
|
-
import * as smartstring from '@push.rocks/smartstring';
|
|
16
12
|
export declare const smartfs: SmartFs;
|
|
17
|
-
export { lik, npmextra, path, projectinfo,
|
|
13
|
+
export { lik, npmextra, path, projectinfo, smartcli, smartinteract, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartshell, };
|
|
@@ -3,18 +3,14 @@ import * as lik from '@push.rocks/lik';
|
|
|
3
3
|
import * as npmextra from '@push.rocks/npmextra';
|
|
4
4
|
import * as path from 'path';
|
|
5
5
|
import * as projectinfo from '@push.rocks/projectinfo';
|
|
6
|
-
import * as smartpromise from '@push.rocks/smartpromise';
|
|
7
|
-
import * as qenv from '@push.rocks/qenv';
|
|
8
6
|
import * as smartcli from '@push.rocks/smartcli';
|
|
9
7
|
import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
|
|
10
8
|
import * as smartlog from '@push.rocks/smartlog';
|
|
11
9
|
import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
|
|
12
10
|
import * as smartlogSouceOra from '@push.rocks/smartlog-source-ora';
|
|
13
|
-
import * as smartopen from '@push.rocks/smartopen';
|
|
14
11
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
15
12
|
import * as smartshell from '@push.rocks/smartshell';
|
|
16
|
-
import * as smartstring from '@push.rocks/smartstring';
|
|
17
13
|
// Create smartfs instance
|
|
18
14
|
export const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
19
|
-
export { lik, npmextra, path, projectinfo,
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
export { lik, npmextra, path, projectinfo, smartcli, smartinteract, smartlog, smartlogDestinationLocal, smartlogSouceOra, smartshell, };
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNkb2NrZXIucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3RzZG9ja2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25FLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLHdCQUF3QixNQUFNLHdDQUF3QyxDQUFDO0FBQ25GLE9BQU8sS0FBSyxnQkFBZ0IsTUFBTSxpQ0FBaUMsQ0FBQztBQUNwRSxPQUFPLEtBQUssYUFBYSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFFckQsMEJBQTBCO0FBQzFCLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLG1CQUFtQixFQUFFLENBQUMsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsR0FBRyxFQUNILFFBQVEsRUFDUixJQUFJLEVBQ0osV0FBVyxFQUNYLFFBQVEsRUFDUixhQUFhLEVBQ2IsUUFBUSxFQUNSLHdCQUF3QixFQUN4QixnQkFBZ0IsRUFDaEIsVUFBVSxHQUNYLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tsdocker",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "develop npm modules cross platform with docker",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -11,13 +11,6 @@
|
|
|
11
11
|
"scripts": {
|
|
12
12
|
"test": "(npm run build)",
|
|
13
13
|
"build": "(tsbuild)",
|
|
14
|
-
"testIntegration": "(npm run clean && npm run setupCheck && npm run testStandard)",
|
|
15
|
-
"testStandard": "(cd test/ && tsx ../ts/index.ts)",
|
|
16
|
-
"testClean": "(cd test/ && tsx ../ts/index.ts clean --all)",
|
|
17
|
-
"testVscode": "(cd test/ && tsx ../ts/index.ts vscode)",
|
|
18
|
-
"clean": "(rm -rf test/)",
|
|
19
|
-
"compile": "(npmts --notest)",
|
|
20
|
-
"setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
|
|
21
14
|
"buildDocs": "tsdoc"
|
|
22
15
|
},
|
|
23
16
|
"repository": {
|
|
@@ -43,18 +36,13 @@
|
|
|
43
36
|
"@push.rocks/lik": "^6.2.2",
|
|
44
37
|
"@push.rocks/npmextra": "^5.3.3",
|
|
45
38
|
"@push.rocks/projectinfo": "^5.0.2",
|
|
46
|
-
"@push.rocks/qenv": "^6.1.3",
|
|
47
|
-
"@push.rocks/smartanalytics": "^2.0.15",
|
|
48
39
|
"@push.rocks/smartcli": "^4.0.20",
|
|
49
40
|
"@push.rocks/smartfs": "^1.3.1",
|
|
50
41
|
"@push.rocks/smartinteract": "^2.0.16",
|
|
51
42
|
"@push.rocks/smartlog": "^3.1.10",
|
|
52
43
|
"@push.rocks/smartlog-destination-local": "^9.0.2",
|
|
53
44
|
"@push.rocks/smartlog-source-ora": "^1.0.9",
|
|
54
|
-
"@push.rocks/
|
|
55
|
-
"@push.rocks/smartpromise": "^4.2.3",
|
|
56
|
-
"@push.rocks/smartshell": "^3.3.0",
|
|
57
|
-
"@push.rocks/smartstring": "^4.1.0"
|
|
45
|
+
"@push.rocks/smartshell": "^3.3.0"
|
|
58
46
|
},
|
|
59
47
|
"packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34",
|
|
60
48
|
"type": "module",
|
package/readme.hints.md
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
## Module Purpose
|
|
4
4
|
|
|
5
5
|
tsdocker is a comprehensive Docker development and building tool. It provides:
|
|
6
|
-
- Testing npm modules in clean Docker environments (legacy feature)
|
|
7
6
|
- Building Dockerfiles with dependency ordering
|
|
8
7
|
- Multi-registry push/pull support
|
|
9
8
|
- Multi-architecture builds (amd64/arm64)
|
|
@@ -12,7 +11,7 @@ tsdocker is a comprehensive Docker development and building tool. It provides:
|
|
|
12
11
|
|
|
13
12
|
| Command | Description |
|
|
14
13
|
|---------|-------------|
|
|
15
|
-
| `tsdocker` |
|
|
14
|
+
| `tsdocker` | Show usage / man page |
|
|
16
15
|
| `tsdocker build` | Build all Dockerfiles with dependency ordering |
|
|
17
16
|
| `tsdocker push [registry]` | Push images to configured registries |
|
|
18
17
|
| `tsdocker pull <registry>` | Pull images from registry |
|
|
@@ -20,7 +19,6 @@ tsdocker is a comprehensive Docker development and building tool. It provides:
|
|
|
20
19
|
| `tsdocker login` | Login to configured registries |
|
|
21
20
|
| `tsdocker list` | List discovered Dockerfiles and dependencies |
|
|
22
21
|
| `tsdocker clean --all` | Clean up Docker environment |
|
|
23
|
-
| `tsdocker vscode` | Start VS Code in Docker |
|
|
24
22
|
|
|
25
23
|
## Configuration
|
|
26
24
|
|
|
@@ -45,9 +43,6 @@ Configure in `package.json` under `@git.zone/tsdocker`:
|
|
|
45
43
|
|
|
46
44
|
### Configuration Options
|
|
47
45
|
|
|
48
|
-
- `baseImage`: Base Docker image for testing (legacy)
|
|
49
|
-
- `command`: Command to run in container (legacy)
|
|
50
|
-
- `dockerSock`: Mount Docker socket (legacy)
|
|
51
46
|
- `registries`: Array of registry URLs to push to
|
|
52
47
|
- `registryRepoMap`: Map registry URLs to different repo paths
|
|
53
48
|
- `buildArgEnvMap`: Map Docker build ARGs to environment variables
|
|
@@ -78,8 +73,6 @@ ts/
|
|
|
78
73
|
├── tsdocker.cli.ts (CLI commands)
|
|
79
74
|
├── tsdocker.config.ts (configuration)
|
|
80
75
|
├── tsdocker.plugins.ts (plugin imports)
|
|
81
|
-
├── tsdocker.docker.ts (legacy test runner)
|
|
82
|
-
├── tsdocker.snippets.ts (Dockerfile generation)
|
|
83
76
|
├── classes.dockerfile.ts (Dockerfile management)
|
|
84
77
|
├── classes.dockerregistry.ts (registry authentication)
|
|
85
78
|
├── classes.registrystorage.ts (registry storage)
|
|
@@ -123,8 +116,6 @@ The `config.push` field is now a no-op (kept for backward compat).
|
|
|
123
116
|
## Build Status
|
|
124
117
|
|
|
125
118
|
- Build: ✅ Passes
|
|
126
|
-
- Legacy test functionality preserved
|
|
127
|
-
- New Docker build functionality added
|
|
128
119
|
|
|
129
120
|
## Previous Upgrades (2025-11-22)
|
|
130
121
|
|