@git.zone/tsdocker 1.15.1 → 1.16.0
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 +1 -1
- package/dist_ts/classes.dockercontext.js +13 -3
- package/dist_ts/classes.dockerfile.d.ts +13 -6
- package/dist_ts/classes.dockerfile.js +130 -41
- package/dist_ts/classes.tsdockermanager.d.ts +7 -0
- package/dist_ts/classes.tsdockermanager.js +30 -11
- package/dist_ts/classes.tsdockersession.d.ts +35 -0
- package/dist_ts/classes.tsdockersession.js +92 -0
- package/dist_ts/interfaces/index.d.ts +1 -0
- package/dist_ts/tsdocker.cli.js +4 -1
- package/package.json +1 -1
- package/readme.md +186 -111
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dockercontext.ts +12 -2
- package/ts/classes.dockerfile.ts +145 -41
- package/ts/classes.tsdockermanager.ts +31 -10
- package/ts/classes.tsdockersession.ts +107 -0
- package/ts/interfaces/index.ts +1 -0
- package/ts/tsdocker.cli.ts +3 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tsdocker',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.16.0',
|
|
7
7
|
description: 'develop npm modules cross platform with docker'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdEQUFnRDtDQUM5RCxDQUFBIn0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './tsdocker.plugins.js';
|
|
2
|
+
import * as fs from 'fs';
|
|
2
3
|
import { logger } from './tsdocker.logging.js';
|
|
3
4
|
const smartshellInstance = new plugins.smartshell.Smartshell({ executor: 'bash' });
|
|
4
5
|
export class DockerContext {
|
|
@@ -27,20 +28,29 @@ export class DockerContext {
|
|
|
27
28
|
if (infoResult.exitCode === 0 && infoResult.stdout) {
|
|
28
29
|
isRootless = infoResult.stdout.includes('name=rootless');
|
|
29
30
|
}
|
|
30
|
-
|
|
31
|
+
// Detect topology
|
|
32
|
+
let topology = 'local';
|
|
33
|
+
if (process.env.DOCKER_HOST && process.env.DOCKER_HOST.startsWith('tcp://')) {
|
|
34
|
+
topology = 'dind';
|
|
35
|
+
}
|
|
36
|
+
else if (fs.existsSync('/.dockerenv')) {
|
|
37
|
+
topology = 'socket-mount';
|
|
38
|
+
}
|
|
39
|
+
this.contextInfo = { name, endpoint, isRootless, dockerHost: process.env.DOCKER_HOST, topology };
|
|
31
40
|
return this.contextInfo;
|
|
32
41
|
}
|
|
33
42
|
/** Logs context info prominently. */
|
|
34
43
|
logContextInfo() {
|
|
35
44
|
if (!this.contextInfo)
|
|
36
45
|
return;
|
|
37
|
-
const { name, endpoint, isRootless, dockerHost } = this.contextInfo;
|
|
46
|
+
const { name, endpoint, isRootless, dockerHost, topology } = this.contextInfo;
|
|
38
47
|
logger.log('info', '=== DOCKER CONTEXT ===');
|
|
39
48
|
logger.log('info', `Context: ${name}`);
|
|
40
49
|
logger.log('info', `Endpoint: ${endpoint}`);
|
|
41
50
|
if (dockerHost)
|
|
42
51
|
logger.log('info', `DOCKER_HOST: ${dockerHost}`);
|
|
43
52
|
logger.log('info', `Rootless: ${isRootless ? 'yes' : 'no'}`);
|
|
53
|
+
logger.log('info', `Topology: ${topology || 'local'}`);
|
|
44
54
|
}
|
|
45
55
|
/** Emits rootless-specific warnings. */
|
|
46
56
|
logRootlessWarnings() {
|
|
@@ -56,4 +66,4 @@ export class DockerContext {
|
|
|
56
66
|
return `tsdocker-builder-${sanitized}`;
|
|
57
67
|
}
|
|
58
68
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kb2NrZXJjb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5kb2NrZXJjb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sdUJBQXVCLENBQUM7QUFDakQsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDekIsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRy9DLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO0FBRW5GLE1BQU0sT0FBTyxhQUFhO0lBQ2pCLFdBQVcsR0FBOEIsSUFBSSxDQUFDO0lBRXJELGtFQUFrRTtJQUMzRCxVQUFVLENBQUMsV0FBbUI7UUFDbkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsV0FBVyxDQUFDO1FBQ3pDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLHFDQUFxQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3pFLENBQUM7SUFFRCxrR0FBa0c7SUFDM0YsS0FBSyxDQUFDLE1BQU07UUFDakIsSUFBSSxJQUFJLEdBQUcsU0FBUyxDQUFDO1FBQ3JCLElBQUksUUFBUSxHQUFHLFNBQVMsQ0FBQztRQUV6QixNQUFNLGFBQWEsR0FBRyxNQUFNLGtCQUFrQixDQUFDLFVBQVUsQ0FDdkQsOENBQThDLENBQy9DLENBQUM7UUFDRixJQUFJLGFBQWEsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUN6RCxJQUFJLENBQUM7Z0JBQ0gsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQ3ZELE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO2dCQUN4RCxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxTQUFTLENBQUM7Z0JBQzlCLFFBQVEsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxJQUFJLElBQUksU0FBUyxDQUFDO1lBQ3ZELENBQUM7WUFBQyxNQUFNLENBQUMsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1FBQ3hDLENBQUM7UUFFRCxJQUFJLFVBQVUsR0FBRyxLQUFLLENBQUM7UUFDdkIsTUFBTSxVQUFVLEdBQUcsTUFBTSxrQkFBa0IsQ0FBQyxVQUFVLENBQ3BELGtEQUFrRCxDQUNuRCxDQUFDO1FBQ0YsSUFBSSxVQUFVLENBQUMsUUFBUSxLQUFLLENBQUMsSUFBSSxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDbkQsVUFBVSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzNELENBQUM7UUFFRCxrQkFBa0I7UUFDbEIsSUFBSSxRQUFRLEdBQXNDLE9BQU8sQ0FBQztRQUMxRCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1lBQzVFLFFBQVEsR0FBRyxNQUFNLENBQUM7UUFDcEIsQ0FBQzthQUFNLElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1lBQ3hDLFFBQVEsR0FBRyxjQUFjLENBQUM7UUFDNUIsQ0FBQztRQUVELElBQUksQ0FBQyxXQUFXLEdBQUcsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFDakcsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDO0lBQzFCLENBQUM7SUFFRCxxQ0FBcUM7SUFDOUIsY0FBYztRQUNuQixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFBRSxPQUFPO1FBQzlCLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQztRQUM5RSxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO1FBQzdDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGFBQWEsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN4QyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxhQUFhLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDNUMsSUFBSSxVQUFVO1lBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDakUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsYUFBYSxVQUFVLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUM3RCxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxhQUFhLFFBQVEsSUFBSSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFRCx3Q0FBd0M7SUFDakMsbUJBQW1CO1FBQ3hCLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLFVBQVU7WUFBRSxPQUFPO1FBQzFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLGdFQUFnRSxDQUFDLENBQUM7UUFDckYsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsNkVBQTZFLENBQUMsQ0FBQztJQUNwRyxDQUFDO0lBRUQscUVBQXFFO0lBQzlELGNBQWM7UUFDbkIsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLElBQUksU0FBUyxDQUFDO1FBQ3hELE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxPQUFPLENBQUMsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDOUQsT0FBTyxvQkFBb0IsU0FBUyxFQUFFLENBQUM7SUFDekMsQ0FBQztDQUNGIn0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DockerRegistry } from './classes.dockerregistry.js';
|
|
2
|
+
import { TsDockerSession } from './classes.tsdockersession.js';
|
|
2
3
|
import type { IDockerfileOptions } from './interfaces/index.js';
|
|
3
4
|
import type { TsDockerManager } from './classes.tsdockermanager.js';
|
|
4
5
|
/**
|
|
@@ -21,12 +22,12 @@ export declare class Dockerfile {
|
|
|
21
22
|
static needsLocalRegistry(_dockerfiles?: Dockerfile[], _options?: {
|
|
22
23
|
platform?: string;
|
|
23
24
|
}): boolean;
|
|
24
|
-
/** Starts a persistent registry:2 container
|
|
25
|
-
static startLocalRegistry(isRootless?: boolean): Promise<void>;
|
|
26
|
-
/** Stops and removes the
|
|
27
|
-
static stopLocalRegistry(): Promise<void>;
|
|
25
|
+
/** Starts a persistent registry:2 container with session-unique port and name. */
|
|
26
|
+
static startLocalRegistry(session: TsDockerSession, isRootless?: boolean): Promise<void>;
|
|
27
|
+
/** Stops and removes the session-specific local registry container. */
|
|
28
|
+
static stopLocalRegistry(session: TsDockerSession): Promise<void>;
|
|
28
29
|
/** Pushes a built image to the local registry for buildx consumption. */
|
|
29
|
-
static pushToLocalRegistry(dockerfile: Dockerfile): Promise<void>;
|
|
30
|
+
static pushToLocalRegistry(session: TsDockerSession, dockerfile: Dockerfile): Promise<void>;
|
|
30
31
|
/**
|
|
31
32
|
* Groups topologically sorted Dockerfiles into dependency levels.
|
|
32
33
|
* Level 0 = no local dependencies; level N = depends on something in level N-1.
|
|
@@ -41,7 +42,7 @@ export declare class Dockerfile {
|
|
|
41
42
|
/**
|
|
42
43
|
* Builds the corresponding real docker image for each Dockerfile class instance
|
|
43
44
|
*/
|
|
44
|
-
static buildDockerfiles(sortedArrayArg: Dockerfile[], options?: {
|
|
45
|
+
static buildDockerfiles(sortedArrayArg: Dockerfile[], session: TsDockerSession, options?: {
|
|
45
46
|
platform?: string;
|
|
46
47
|
timeout?: number;
|
|
47
48
|
noCache?: boolean;
|
|
@@ -87,6 +88,7 @@ export declare class Dockerfile {
|
|
|
87
88
|
*/
|
|
88
89
|
static getDockerBuildArgs(managerRef: TsDockerManager): Promise<string>;
|
|
89
90
|
managerRef: TsDockerManager;
|
|
91
|
+
session?: TsDockerSession;
|
|
90
92
|
filePath: string;
|
|
91
93
|
repo: string;
|
|
92
94
|
version: string;
|
|
@@ -100,6 +102,11 @@ export declare class Dockerfile {
|
|
|
100
102
|
localBaseDockerfile: Dockerfile;
|
|
101
103
|
localRegistryTag?: string;
|
|
102
104
|
constructor(managerRefArg: TsDockerManager, options: IDockerfileOptions);
|
|
105
|
+
/**
|
|
106
|
+
* Creates a line-by-line handler for Docker build output that logs
|
|
107
|
+
* recognized layer/step lines in an emphasized format.
|
|
108
|
+
*/
|
|
109
|
+
private createBuildOutputHandler;
|
|
103
110
|
/**
|
|
104
111
|
* Builds the Dockerfile
|
|
105
112
|
*/
|
|
@@ -3,13 +3,19 @@ import * as paths from './tsdocker.paths.js';
|
|
|
3
3
|
import { logger, formatDuration } from './tsdocker.logging.js';
|
|
4
4
|
import { DockerRegistry } from './classes.dockerregistry.js';
|
|
5
5
|
import { RegistryCopy } from './classes.registrycopy.js';
|
|
6
|
+
import { TsDockerSession } from './classes.tsdockersession.js';
|
|
6
7
|
import * as fs from 'fs';
|
|
7
8
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
8
9
|
executor: 'bash',
|
|
9
10
|
});
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
/**
|
|
12
|
+
* Extracts a platform string (e.g. "linux/amd64") from a buildx bracket prefix.
|
|
13
|
+
* The prefix may be like "linux/amd64 ", "linux/amd64 stage-1 ", "stage-1 ", or "".
|
|
14
|
+
*/
|
|
15
|
+
function extractPlatform(prefix) {
|
|
16
|
+
const match = prefix.match(/linux\/\w+/);
|
|
17
|
+
return match ? match[0] : null;
|
|
18
|
+
}
|
|
13
19
|
/**
|
|
14
20
|
* Class Dockerfile represents a Dockerfile on disk
|
|
15
21
|
*/
|
|
@@ -120,31 +126,44 @@ export class Dockerfile {
|
|
|
120
126
|
static needsLocalRegistry(_dockerfiles, _options) {
|
|
121
127
|
return true;
|
|
122
128
|
}
|
|
123
|
-
/** Starts a persistent registry:2 container
|
|
124
|
-
static async startLocalRegistry(isRootless) {
|
|
125
|
-
|
|
126
|
-
|
|
129
|
+
/** Starts a persistent registry:2 container with session-unique port and name. */
|
|
130
|
+
static async startLocalRegistry(session, isRootless) {
|
|
131
|
+
const { registryPort, registryHost, registryContainerName, isCI, sessionId } = session.config;
|
|
132
|
+
// Ensure persistent storage directory exists — isolate per session in CI
|
|
133
|
+
const registryDataDir = isCI
|
|
134
|
+
? plugins.path.join(paths.cwd, '.nogit', 'docker-registry', sessionId)
|
|
135
|
+
: plugins.path.join(paths.cwd, '.nogit', 'docker-registry');
|
|
127
136
|
fs.mkdirSync(registryDataDir, { recursive: true });
|
|
128
|
-
await smartshellInstance.execSilent(`docker rm -f ${
|
|
129
|
-
const
|
|
137
|
+
await smartshellInstance.execSilent(`docker rm -f ${registryContainerName} 2>/dev/null || true`);
|
|
138
|
+
const runCmd = `docker run -d --name ${registryContainerName} -p ${registryPort}:5000 -v "${registryDataDir}:/var/lib/registry" registry:2`;
|
|
139
|
+
let result = await smartshellInstance.execSilent(runCmd);
|
|
140
|
+
// Port retry: if port was stolen between allocation and docker run, reallocate once
|
|
141
|
+
if (result.exitCode !== 0 && (result.stderr || result.stdout || '').includes('port is already allocated')) {
|
|
142
|
+
const newPort = await TsDockerSession.allocatePort();
|
|
143
|
+
logger.log('warn', `Port ${registryPort} taken, retrying with ${newPort}`);
|
|
144
|
+
session.config.registryPort = newPort;
|
|
145
|
+
session.config.registryHost = `localhost:${newPort}`;
|
|
146
|
+
const retryCmd = `docker run -d --name ${registryContainerName} -p ${newPort}:5000 -v "${registryDataDir}:/var/lib/registry" registry:2`;
|
|
147
|
+
result = await smartshellInstance.execSilent(retryCmd);
|
|
148
|
+
}
|
|
130
149
|
if (result.exitCode !== 0) {
|
|
131
150
|
throw new Error(`Failed to start local registry: ${result.stderr || result.stdout}`);
|
|
132
151
|
}
|
|
133
152
|
// registry:2 starts near-instantly; brief wait for readiness
|
|
134
153
|
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
135
|
-
logger.log('info', `Started local registry at ${
|
|
154
|
+
logger.log('info', `Started local registry at ${session.config.registryHost} (container: ${registryContainerName})`);
|
|
136
155
|
if (isRootless) {
|
|
137
|
-
logger.log('warn', `[rootless] Registry on port ${
|
|
156
|
+
logger.log('warn', `[rootless] Registry on port ${session.config.registryPort} — if buildx cannot reach localhost, try 127.0.0.1`);
|
|
138
157
|
}
|
|
139
158
|
}
|
|
140
|
-
/** Stops and removes the
|
|
141
|
-
static async stopLocalRegistry() {
|
|
142
|
-
await smartshellInstance.execSilent(`docker rm -f ${
|
|
143
|
-
logger.log('info',
|
|
159
|
+
/** Stops and removes the session-specific local registry container. */
|
|
160
|
+
static async stopLocalRegistry(session) {
|
|
161
|
+
await smartshellInstance.execSilent(`docker rm -f ${session.config.registryContainerName} 2>/dev/null || true`);
|
|
162
|
+
logger.log('info', `Stopped local registry (${session.config.registryContainerName})`);
|
|
144
163
|
}
|
|
145
164
|
/** Pushes a built image to the local registry for buildx consumption. */
|
|
146
|
-
static async pushToLocalRegistry(dockerfile) {
|
|
147
|
-
const registryTag = `${
|
|
165
|
+
static async pushToLocalRegistry(session, dockerfile) {
|
|
166
|
+
const registryTag = `${session.config.registryHost}/${dockerfile.buildTag}`;
|
|
148
167
|
await smartshellInstance.execSilent(`docker tag ${dockerfile.buildTag} ${registryTag}`);
|
|
149
168
|
const result = await smartshellInstance.execSilent(`docker push ${registryTag}`);
|
|
150
169
|
if (result.exitCode !== 0) {
|
|
@@ -198,10 +217,10 @@ export class Dockerfile {
|
|
|
198
217
|
/**
|
|
199
218
|
* Builds the corresponding real docker image for each Dockerfile class instance
|
|
200
219
|
*/
|
|
201
|
-
static async buildDockerfiles(sortedArrayArg, options) {
|
|
220
|
+
static async buildDockerfiles(sortedArrayArg, session, options) {
|
|
202
221
|
const total = sortedArrayArg.length;
|
|
203
222
|
const overallStart = Date.now();
|
|
204
|
-
await Dockerfile.startLocalRegistry(options?.isRootless);
|
|
223
|
+
await Dockerfile.startLocalRegistry(session, options?.isRootless);
|
|
205
224
|
try {
|
|
206
225
|
if (options?.parallel) {
|
|
207
226
|
// === PARALLEL MODE: build independent images concurrently within each level ===
|
|
@@ -242,7 +261,7 @@ export class Dockerfile {
|
|
|
242
261
|
}
|
|
243
262
|
// Push ALL images to local registry (skip if already pushed via buildx)
|
|
244
263
|
if (!df.localRegistryTag) {
|
|
245
|
-
await Dockerfile.pushToLocalRegistry(df);
|
|
264
|
+
await Dockerfile.pushToLocalRegistry(session, df);
|
|
246
265
|
}
|
|
247
266
|
}
|
|
248
267
|
}
|
|
@@ -268,13 +287,13 @@ export class Dockerfile {
|
|
|
268
287
|
}
|
|
269
288
|
// Push ALL images to local registry (skip if already pushed via buildx)
|
|
270
289
|
if (!dockerfileArg.localRegistryTag) {
|
|
271
|
-
await Dockerfile.pushToLocalRegistry(dockerfileArg);
|
|
290
|
+
await Dockerfile.pushToLocalRegistry(session, dockerfileArg);
|
|
272
291
|
}
|
|
273
292
|
}
|
|
274
293
|
}
|
|
275
294
|
}
|
|
276
295
|
finally {
|
|
277
|
-
await Dockerfile.stopLocalRegistry();
|
|
296
|
+
await Dockerfile.stopLocalRegistry(session);
|
|
278
297
|
}
|
|
279
298
|
logger.log('info', `Total build time: ${formatDuration(Date.now() - overallStart)}`);
|
|
280
299
|
return sortedArrayArg;
|
|
@@ -425,6 +444,7 @@ export class Dockerfile {
|
|
|
425
444
|
}
|
|
426
445
|
// INSTANCE PROPERTIES
|
|
427
446
|
managerRef;
|
|
447
|
+
session;
|
|
428
448
|
filePath;
|
|
429
449
|
repo;
|
|
430
450
|
version;
|
|
@@ -464,6 +484,70 @@ export class Dockerfile {
|
|
|
464
484
|
this.baseImage = Dockerfile.dockerBaseImage(this.content);
|
|
465
485
|
this.localBaseImageDependent = false;
|
|
466
486
|
}
|
|
487
|
+
/**
|
|
488
|
+
* Creates a line-by-line handler for Docker build output that logs
|
|
489
|
+
* recognized layer/step lines in an emphasized format.
|
|
490
|
+
*/
|
|
491
|
+
createBuildOutputHandler(verbose) {
|
|
492
|
+
let buffer = '';
|
|
493
|
+
const tag = this.cleanTag;
|
|
494
|
+
const handleLine = (line) => {
|
|
495
|
+
// In verbose mode, write raw output prefixed with tag for identification
|
|
496
|
+
if (verbose) {
|
|
497
|
+
process.stdout.write(`[${tag}] ${line}\n`);
|
|
498
|
+
}
|
|
499
|
+
// Buildx step: #N [platform step/total] INSTRUCTION
|
|
500
|
+
const bxStep = line.match(/^#\d+ \[([^\]]+?)(\d+\/\d+)\] (.+)/);
|
|
501
|
+
if (bxStep) {
|
|
502
|
+
const prefix = bxStep[1].trim();
|
|
503
|
+
const step = bxStep[2];
|
|
504
|
+
const instruction = bxStep[3];
|
|
505
|
+
const platform = extractPlatform(prefix);
|
|
506
|
+
const platStr = platform ? `${platform} ▸ ` : '';
|
|
507
|
+
logger.log('note', `[${tag}] ${platStr}[${step}] ${instruction}`);
|
|
508
|
+
return;
|
|
509
|
+
}
|
|
510
|
+
// Buildx CACHED: #N CACHED
|
|
511
|
+
const bxCached = line.match(/^#(\d+) CACHED/);
|
|
512
|
+
if (bxCached) {
|
|
513
|
+
logger.log('note', `[${tag}] CACHED`);
|
|
514
|
+
return;
|
|
515
|
+
}
|
|
516
|
+
// Buildx DONE: #N DONE 12.3s
|
|
517
|
+
const bxDone = line.match(/^#\d+ DONE (.+)/);
|
|
518
|
+
if (bxDone) {
|
|
519
|
+
const timing = bxDone[1];
|
|
520
|
+
if (!timing.startsWith('0.0')) {
|
|
521
|
+
logger.log('note', `[${tag}] DONE ${timing}`);
|
|
522
|
+
}
|
|
523
|
+
return;
|
|
524
|
+
}
|
|
525
|
+
// Buildx export phase: #N exporting ...
|
|
526
|
+
const bxExport = line.match(/^#\d+ exporting (.+)/);
|
|
527
|
+
if (bxExport) {
|
|
528
|
+
logger.log('note', `[${tag}] exporting ${bxExport[1]}`);
|
|
529
|
+
return;
|
|
530
|
+
}
|
|
531
|
+
// Standard docker build: Step N/M : INSTRUCTION
|
|
532
|
+
const stdStep = line.match(/^Step (\d+\/\d+) : (.+)/);
|
|
533
|
+
if (stdStep) {
|
|
534
|
+
logger.log('note', `[${tag}] Step ${stdStep[1]}: ${stdStep[2]}`);
|
|
535
|
+
return;
|
|
536
|
+
}
|
|
537
|
+
};
|
|
538
|
+
return {
|
|
539
|
+
handleChunk: (chunk) => {
|
|
540
|
+
buffer += chunk.toString();
|
|
541
|
+
const lines = buffer.split('\n');
|
|
542
|
+
buffer = lines.pop() || '';
|
|
543
|
+
for (const line of lines) {
|
|
544
|
+
const trimmed = line.replace(/\r$/, '').trim();
|
|
545
|
+
if (trimmed)
|
|
546
|
+
handleLine(trimmed);
|
|
547
|
+
}
|
|
548
|
+
},
|
|
549
|
+
};
|
|
550
|
+
}
|
|
467
551
|
/**
|
|
468
552
|
* Builds the Dockerfile
|
|
469
553
|
*/
|
|
@@ -488,28 +572,31 @@ export class Dockerfile {
|
|
|
488
572
|
let buildCommand;
|
|
489
573
|
if (platformOverride) {
|
|
490
574
|
// Single platform override via buildx
|
|
491
|
-
buildCommand = `docker buildx build --platform ${platformOverride}${noCacheFlag}${buildContextFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
|
|
575
|
+
buildCommand = `docker buildx build --progress=plain --platform ${platformOverride}${noCacheFlag}${buildContextFlag} --load -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
|
|
492
576
|
logger.log('info', `Build: buildx --platform ${platformOverride} --load`);
|
|
493
577
|
}
|
|
494
578
|
else if (config.platforms && config.platforms.length > 1) {
|
|
495
579
|
// Multi-platform build using buildx — always push to local registry
|
|
496
580
|
const platformString = config.platforms.join(',');
|
|
497
|
-
const
|
|
498
|
-
|
|
581
|
+
const registryHost = this.session?.config.registryHost || 'localhost:5234';
|
|
582
|
+
const localTag = `${registryHost}/${this.buildTag}`;
|
|
583
|
+
buildCommand = `docker buildx build --progress=plain --platform ${platformString}${noCacheFlag}${buildContextFlag} -t ${localTag} -f ${this.filePath} ${buildArgsString} --push .`;
|
|
499
584
|
this.localRegistryTag = localTag;
|
|
500
585
|
logger.log('info', `Build: buildx --platform ${platformString} --push to local registry`);
|
|
501
586
|
}
|
|
502
587
|
else {
|
|
503
588
|
// Standard build
|
|
504
589
|
const versionLabel = this.managerRef.projectInfo?.npm?.version || 'unknown';
|
|
505
|
-
buildCommand = `docker build --label="version=${versionLabel}"${noCacheFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
|
|
590
|
+
buildCommand = `docker build --progress=plain --label="version=${versionLabel}"${noCacheFlag} -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
|
|
506
591
|
logger.log('info', 'Build: docker build (standard)');
|
|
507
592
|
}
|
|
593
|
+
// Execute build with real-time layer logging
|
|
594
|
+
const handler = this.createBuildOutputHandler(verbose);
|
|
595
|
+
const streaming = await smartshellInstance.execStreamingSilent(buildCommand);
|
|
596
|
+
// Intercept output for layer logging
|
|
597
|
+
streaming.childProcess.stdout?.on('data', handler.handleChunk);
|
|
598
|
+
streaming.childProcess.stderr?.on('data', handler.handleChunk);
|
|
508
599
|
if (timeout) {
|
|
509
|
-
// Use streaming execution with timeout
|
|
510
|
-
const streaming = verbose
|
|
511
|
-
? await smartshellInstance.execStreaming(buildCommand)
|
|
512
|
-
: await smartshellInstance.execStreamingSilent(buildCommand);
|
|
513
600
|
const timeoutPromise = new Promise((_, reject) => {
|
|
514
601
|
setTimeout(() => {
|
|
515
602
|
streaming.childProcess.kill();
|
|
@@ -523,9 +610,7 @@ export class Dockerfile {
|
|
|
523
610
|
}
|
|
524
611
|
}
|
|
525
612
|
else {
|
|
526
|
-
const result =
|
|
527
|
-
? await smartshellInstance.exec(buildCommand)
|
|
528
|
-
: await smartshellInstance.execSilent(buildCommand);
|
|
613
|
+
const result = await streaming.finalPromise;
|
|
529
614
|
if (result.exitCode !== 0) {
|
|
530
615
|
logger.log('error', `Build failed for ${this.cleanTag}`);
|
|
531
616
|
if (!verbose && result.stdout) {
|
|
@@ -544,9 +629,10 @@ export class Dockerfile {
|
|
|
544
629
|
const destRepo = this.getDestRepo(dockerRegistryArg.registryUrl);
|
|
545
630
|
const destTag = versionSuffix ? `${this.version}_${versionSuffix}` : this.version;
|
|
546
631
|
const registryCopy = new RegistryCopy();
|
|
632
|
+
const registryHost = this.session?.config.registryHost || 'localhost:5234';
|
|
547
633
|
this.pushTag = `${dockerRegistryArg.registryUrl}/${destRepo}:${destTag}`;
|
|
548
634
|
logger.log('info', `Pushing ${this.pushTag} via OCI copy from local registry...`);
|
|
549
|
-
await registryCopy.copyImage(
|
|
635
|
+
await registryCopy.copyImage(registryHost, this.repo, this.version, dockerRegistryArg.registryUrl, destRepo, destTag, { username: dockerRegistryArg.username, password: dockerRegistryArg.password });
|
|
550
636
|
logger.log('ok', `Pushed ${this.pushTag}`);
|
|
551
637
|
}
|
|
552
638
|
/**
|
|
@@ -576,16 +662,19 @@ export class Dockerfile {
|
|
|
576
662
|
const testFile = plugins.path.join(testDir, 'test_' + this.version + '.sh');
|
|
577
663
|
// Use local registry tag for multi-platform images (not in daemon), otherwise buildTag
|
|
578
664
|
const imageRef = this.localRegistryTag || this.buildTag;
|
|
665
|
+
const sessionId = this.session?.config.sessionId || 'default';
|
|
666
|
+
const testContainerName = `tsdocker_test_${sessionId}`;
|
|
667
|
+
const testImageName = `tsdocker_test_image_${sessionId}`;
|
|
579
668
|
const testFileExists = fs.existsSync(testFile);
|
|
580
669
|
if (testFileExists) {
|
|
581
670
|
// Run tests in container
|
|
582
|
-
await smartshellInstance.exec(`docker run --name
|
|
583
|
-
await smartshellInstance.exec(`docker cp ${testFile}
|
|
584
|
-
await smartshellInstance.exec(`docker commit
|
|
585
|
-
const testResult = await smartshellInstance.exec(`docker run --entrypoint="bash"
|
|
671
|
+
await smartshellInstance.exec(`docker run --name ${testContainerName} --entrypoint="bash" ${imageRef} -c "mkdir /tsdocker_test"`);
|
|
672
|
+
await smartshellInstance.exec(`docker cp ${testFile} ${testContainerName}:/tsdocker_test/test.sh`);
|
|
673
|
+
await smartshellInstance.exec(`docker commit ${testContainerName} ${testImageName}`);
|
|
674
|
+
const testResult = await smartshellInstance.exec(`docker run --entrypoint="bash" ${testImageName} -x /tsdocker_test/test.sh`);
|
|
586
675
|
// Cleanup
|
|
587
|
-
await smartshellInstance.exec(`docker rm
|
|
588
|
-
await smartshellInstance.exec(`docker rmi --force
|
|
676
|
+
await smartshellInstance.exec(`docker rm ${testContainerName}`);
|
|
677
|
+
await smartshellInstance.exec(`docker rmi --force ${testImageName}`);
|
|
589
678
|
if (testResult.exitCode !== 0) {
|
|
590
679
|
throw new Error(`Tests failed for ${this.cleanTag}`);
|
|
591
680
|
}
|
|
@@ -603,4 +692,4 @@ export class Dockerfile {
|
|
|
603
692
|
return result.stdout.trim();
|
|
604
693
|
}
|
|
605
694
|
}
|
|
606
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dockerfile.js","sourceRoot":"","sources":["../ts/classes.dockerfile.ts"],"names":[],"mappings":"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"}
|
|
695
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dockerfile.js","sourceRoot":"","sources":["../ts/classes.dockerfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Dockerfile } from './classes.dockerfile.js';
|
|
2
2
|
import { RegistryStorage } from './classes.registrystorage.js';
|
|
3
3
|
import { DockerContext } from './classes.dockercontext.js';
|
|
4
|
+
import { TsDockerSession } from './classes.tsdockersession.js';
|
|
4
5
|
import type { ITsDockerConfig, IBuildCommandOptions } from './interfaces/index.js';
|
|
5
6
|
/**
|
|
6
7
|
* Main orchestrator class for Docker operations
|
|
@@ -10,6 +11,7 @@ export declare class TsDockerManager {
|
|
|
10
11
|
config: ITsDockerConfig;
|
|
11
12
|
projectInfo: any;
|
|
12
13
|
dockerContext: DockerContext;
|
|
14
|
+
session: TsDockerSession;
|
|
13
15
|
private dockerfiles;
|
|
14
16
|
constructor(config: ITsDockerConfig);
|
|
15
17
|
/**
|
|
@@ -59,4 +61,9 @@ export declare class TsDockerManager {
|
|
|
59
61
|
* Gets the cached Dockerfiles (after discovery)
|
|
60
62
|
*/
|
|
61
63
|
getDockerfiles(): Dockerfile[];
|
|
64
|
+
/**
|
|
65
|
+
* Cleans up session-specific resources.
|
|
66
|
+
* In CI, removes the session-specific buildx builder to avoid accumulation.
|
|
67
|
+
*/
|
|
68
|
+
cleanup(): Promise<void>;
|
|
62
69
|
}
|