@marinoscar/platform-cli 0.1.0-next.10 → 0.1.0-next.12
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/CHANGELOG.md +16 -0
- package/README.md +1 -1
- package/dist/deploy/index.d.ts +2 -2
- package/dist/deploy/index.d.ts.map +1 -1
- package/dist/deploy/index.js +1 -1
- package/dist/deploy/index.js.map +1 -1
- package/dist/engine/commands/deploy.d.ts.map +1 -1
- package/dist/engine/commands/deploy.js +21 -4
- package/dist/engine/commands/deploy.js.map +1 -1
- package/dist/engine/deploy/checks/host.d.ts.map +1 -1
- package/dist/engine/deploy/checks/host.js +17 -4
- package/dist/engine/deploy/checks/host.js.map +1 -1
- package/dist/engine/deploy/checks/registry.d.ts +8 -0
- package/dist/engine/deploy/checks/registry.d.ts.map +1 -1
- package/dist/engine/deploy/checks/registry.js +1 -0
- package/dist/engine/deploy/checks/registry.js.map +1 -1
- package/dist/engine/deploy/checks/types.d.ts +8 -0
- package/dist/engine/deploy/checks/types.d.ts.map +1 -1
- package/dist/engine/deploy/checks/types.js.map +1 -1
- package/dist/engine/deploy/compose-project.d.ts +107 -0
- package/dist/engine/deploy/compose-project.d.ts.map +1 -0
- package/dist/engine/deploy/compose-project.js +199 -0
- package/dist/engine/deploy/compose-project.js.map +1 -0
- package/dist/engine/deploy/install.d.ts.map +1 -1
- package/dist/engine/deploy/install.js +13 -4
- package/dist/engine/deploy/install.js.map +1 -1
- package/dist/engine/deploy/update.d.ts.map +1 -1
- package/dist/engine/deploy/update.js +18 -1
- package/dist/engine/deploy/update.js.map +1 -1
- package/dist/engine/index.d.ts +2 -0
- package/dist/engine/index.d.ts.map +1 -1
- package/dist/engine/index.js +1 -0
- package/dist/engine/index.js.map +1 -1
- package/dist/engine/tui/screens/deploy/doctor.d.ts.map +1 -1
- package/dist/engine/tui/screens/deploy/doctor.js +11 -2
- package/dist/engine/tui/screens/deploy/doctor.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/engine/deploy/checks/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/engine/deploy/checks/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { type DeployState } from './state.js';
|
|
2
|
+
/**
|
|
3
|
+
* The command seam detection runs through: the engine's `runCommand` (or a
|
|
4
|
+
* test's fake of it). Structural, so the executor's own function is assignable
|
|
5
|
+
* and nothing of the executor leaks into the public surface. It rejects when
|
|
6
|
+
* the command fails, which detection reads as "Docker cannot be asked".
|
|
7
|
+
*
|
|
8
|
+
* @stability experimental
|
|
9
|
+
*/
|
|
10
|
+
export type ComposeProjectCommandRunner = (argv: readonly string[], options: {
|
|
11
|
+
cwd: string;
|
|
12
|
+
timeoutMs?: number | undefined;
|
|
13
|
+
}) => Promise<{
|
|
14
|
+
/** What the command printed on stdout. */
|
|
15
|
+
stdout: string;
|
|
16
|
+
}>;
|
|
17
|
+
/**
|
|
18
|
+
* What Docker says about the compose project of a deployment folder.
|
|
19
|
+
*
|
|
20
|
+
* @stability experimental
|
|
21
|
+
*/
|
|
22
|
+
export type ComposeProjectDetection = {
|
|
23
|
+
/** Exactly one project owns containers started from inside the folder. */
|
|
24
|
+
kind: 'found';
|
|
25
|
+
/** That project's name. */
|
|
26
|
+
project: string;
|
|
27
|
+
} | {
|
|
28
|
+
/** No container was started from inside the folder. */
|
|
29
|
+
kind: 'none';
|
|
30
|
+
} | {
|
|
31
|
+
/** Several projects own containers started from inside the folder. */
|
|
32
|
+
kind: 'ambiguous';
|
|
33
|
+
/** Their names, sorted. */
|
|
34
|
+
projects: string[];
|
|
35
|
+
} | {
|
|
36
|
+
/** Docker could not be asked (not installed, daemon down, permission, timeout). */
|
|
37
|
+
kind: 'unavailable';
|
|
38
|
+
};
|
|
39
|
+
/**
|
|
40
|
+
* Whether `path` is `root` or inside it, by path segment: `/opt/apps/app2` is
|
|
41
|
+
* NOT under `/opt/apps/app`. Both are resolved first; nothing touches the disk,
|
|
42
|
+
* because a container's recorded directory need not exist any more.
|
|
43
|
+
*
|
|
44
|
+
* @param path - The path to test.
|
|
45
|
+
* @param root - The folder it may be under.
|
|
46
|
+
* @returns true when `path` is `root` or below it.
|
|
47
|
+
* @stability experimental
|
|
48
|
+
*/
|
|
49
|
+
export declare function isPathUnder(path: string, root: string): boolean;
|
|
50
|
+
/**
|
|
51
|
+
* Asks Docker which compose project(s) the containers started from inside
|
|
52
|
+
* `deployRoot` belong to, stopped containers included. A container is the
|
|
53
|
+
* deployment's when its working-directory label is the deploy root or under it.
|
|
54
|
+
*
|
|
55
|
+
* Never throws: a Docker that cannot be asked is `unavailable`. Read-only
|
|
56
|
+
* (`docker ps`, `docker inspect`), and argv only, never a shell string.
|
|
57
|
+
*
|
|
58
|
+
* @param deployRoot - The deployment folder (`<apps-root>/<name>`).
|
|
59
|
+
* @param run - The command seam; pass the engine's `runCommand`.
|
|
60
|
+
* @returns the single project found, none, several, or unavailable.
|
|
61
|
+
* @stability experimental
|
|
62
|
+
*/
|
|
63
|
+
export declare function detectComposeProject(deployRoot: string, run: ComposeProjectCommandRunner): Promise<ComposeProjectDetection>;
|
|
64
|
+
/** What `reconcileComposeProject` needs. */
|
|
65
|
+
export interface ReconcileComposeProjectOptions {
|
|
66
|
+
/** The deployment folder. */
|
|
67
|
+
deployRoot: string;
|
|
68
|
+
/** The state as loaded, or undefined when there is no record (nothing to reconcile). */
|
|
69
|
+
state: DeployState | undefined;
|
|
70
|
+
/** The command seam; pass the engine's `runCommand`. */
|
|
71
|
+
runCommand: ComposeProjectCommandRunner;
|
|
72
|
+
}
|
|
73
|
+
/** What `reconcileComposeProject` decided. */
|
|
74
|
+
export interface ReconcileComposeProjectResult {
|
|
75
|
+
/** The state the caller must carry from here on: `composeProject` corrected, everything else untouched. */
|
|
76
|
+
state: DeployState | undefined;
|
|
77
|
+
/** A line for the operator (journal or stderr), when something is worth saying. */
|
|
78
|
+
message?: string | undefined;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Makes the carried compose project match the one Docker says the deployment
|
|
82
|
+
* runs under, when the record is absent or the legacy default.
|
|
83
|
+
*
|
|
84
|
+
* Changes nothing (the state comes back as given) when there is no state, when
|
|
85
|
+
* a project other than the legacy default is recorded (Docker is not asked),
|
|
86
|
+
* when Docker cannot be asked or knows no container of this folder, or when it
|
|
87
|
+
* already agrees. An ambiguous answer changes nothing and returns a warning
|
|
88
|
+
* naming the projects and the state file (silent when `compose` is among them:
|
|
89
|
+
* the engine's default then works).
|
|
90
|
+
*
|
|
91
|
+
* On `found` with a different project: the returned state carries it, and when
|
|
92
|
+
* a state file is on disk it is rewritten through the engine's own writer (same
|
|
93
|
+
* v2 shape, version not bumped, every other field kept) after the previous file
|
|
94
|
+
* is copied once to `.appctl-deploy.json.bak`. An in-memory state with no file
|
|
95
|
+
* (an adopted deployment) is only corrected; the pipeline records it with its
|
|
96
|
+
* first write. If the file cannot be written the corrected project is still
|
|
97
|
+
* used for this run, since running under the wrong one is the outage, and the
|
|
98
|
+
* message says it was not recorded.
|
|
99
|
+
*
|
|
100
|
+
* Never throws: it must not make a command that worked before fail.
|
|
101
|
+
*
|
|
102
|
+
* @param options - The deployment folder, the loaded state and the command seam.
|
|
103
|
+
* @returns the state to carry, and a one-line message when there is one.
|
|
104
|
+
* @stability experimental
|
|
105
|
+
*/
|
|
106
|
+
export declare function reconcileComposeProject(options: ReconcileComposeProjectOptions): Promise<ReconcileComposeProjectResult>;
|
|
107
|
+
//# sourceMappingURL=compose-project.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose-project.d.ts","sourceRoot":"","sources":["../../../src/engine/deploy/compose-project.ts"],"names":[],"mappings":"AAIA,OAAO,EAA+B,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AA+C3E;;;;;;;GAOG;AACH,MAAM,MAAM,2BAA2B,GAAG,CACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,KACrD,OAAO,CAAC;IACX,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAC/B;IACE,0EAA0E;IAC1E,IAAI,EAAE,OAAO,CAAC;IACd,2BAA2B;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,sEAAsE;IACtE,IAAI,EAAE,WAAW,CAAC;IAClB,2BAA2B;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,GACD;IACE,mFAAmF;IACnF,IAAI,EAAE,aAAa,CAAC;CACrB,CAAC;AAEN;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAG/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,uBAAuB,CAAC,CAiClC;AAED,4CAA4C;AAC5C,MAAM,WAAW,8BAA8B;IAC7C,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,wFAAwF;IACxF,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,wDAAwD;IACxD,UAAU,EAAE,2BAA2B,CAAC;CACzC;AAED,8CAA8C;AAC9C,MAAM,WAAW,6BAA6B;IAC5C,2GAA2G;IAC3G,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,6BAA6B,CAAC,CAoDxC"}
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
import { copyFileSync, chmodSync, constants, existsSync } from 'node:fs';
|
|
2
|
+
import { isAbsolute, relative, resolve, sep } from 'node:path';
|
|
3
|
+
import { LEGACY_COMPOSE_PROJECT } from './install.js';
|
|
4
|
+
import { deployStatePath, writeState } from './state.js';
|
|
5
|
+
// =============================================================================
|
|
6
|
+
// Which compose project does this deployment really run under?
|
|
7
|
+
// =============================================================================
|
|
8
|
+
//
|
|
9
|
+
// `composeProjectFor` answers the legacy `compose` for a state file that records
|
|
10
|
+
// no project, and that rule is right for a server whose stack really runs under
|
|
11
|
+
// `compose` (the default project of `infra/compose`). It is wrong for a server
|
|
12
|
+
// installed by a pre-platform CLI that ran compose with an app-named `-p`
|
|
13
|
+
// project and recorded nothing: the engine then passes `-p compose` to every
|
|
14
|
+
// `docker compose` call and to the deploy checks, looks for a stack that is not
|
|
15
|
+
// there and, worse, would START a second one beside the real stack, which holds
|
|
16
|
+
// the bind port. An outage caused by bookkeeping.
|
|
17
|
+
//
|
|
18
|
+
// A recorded name is only a record. What Docker says is the ground truth: every
|
|
19
|
+
// container compose starts carries the directory it was run from
|
|
20
|
+
// (`com.docker.compose.project.working_dir`), and a deployment's stack is run
|
|
21
|
+
// from inside its own folder. So where the state is loaded for `update`,
|
|
22
|
+
// `status` and `doctor`, this reads that label off every container, and when
|
|
23
|
+
// the record is absent (or only the legacy default, which an earlier attempt
|
|
24
|
+
// may have written back) and Docker names exactly one other project for this
|
|
25
|
+
// folder, that project is recorded. A project that was recorded on purpose is
|
|
26
|
+
// never overwritten, and Docker is not even asked.
|
|
27
|
+
// =============================================================================
|
|
28
|
+
/** The label a container carries naming its compose project. */
|
|
29
|
+
const COMPOSE_PROJECT_LABEL = 'com.docker.compose.project';
|
|
30
|
+
/** The label naming the directory compose was run from. */
|
|
31
|
+
const COMPOSE_WORKING_DIR_LABEL = 'com.docker.compose.project.working_dir';
|
|
32
|
+
/** Short by design: a wedged Docker socket must cost seconds, not the command. */
|
|
33
|
+
const DOCKER_QUERY_TIMEOUT_MS = 10_000;
|
|
34
|
+
/**
|
|
35
|
+
* One line per container: compose project, then compose working directory.
|
|
36
|
+
*
|
|
37
|
+
* `{{if .Config.Labels}}` guards a container created without any labels, whose
|
|
38
|
+
* `Labels` is null rather than an empty map (`index` on nil renders
|
|
39
|
+
* `<no value>` into the line otherwise); the separator sits outside the guards
|
|
40
|
+
* so every line has both fields.
|
|
41
|
+
*/
|
|
42
|
+
const INSPECT_FORMAT = `{{if .Config.Labels}}{{index .Config.Labels "${COMPOSE_PROJECT_LABEL}"}}{{end}}|` +
|
|
43
|
+
`{{if .Config.Labels}}{{index .Config.Labels "${COMPOSE_WORKING_DIR_LABEL}"}}{{end}}`;
|
|
44
|
+
/**
|
|
45
|
+
* Whether `path` is `root` or inside it, by path segment: `/opt/apps/app2` is
|
|
46
|
+
* NOT under `/opt/apps/app`. Both are resolved first; nothing touches the disk,
|
|
47
|
+
* because a container's recorded directory need not exist any more.
|
|
48
|
+
*
|
|
49
|
+
* @param path - The path to test.
|
|
50
|
+
* @param root - The folder it may be under.
|
|
51
|
+
* @returns true when `path` is `root` or below it.
|
|
52
|
+
* @stability experimental
|
|
53
|
+
*/
|
|
54
|
+
export function isPathUnder(path, root) {
|
|
55
|
+
const relation = relative(resolve(root), resolve(path));
|
|
56
|
+
return relation === '' || (relation !== '..' && !relation.startsWith(`..${sep}`) && !isAbsolute(relation));
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Asks Docker which compose project(s) the containers started from inside
|
|
60
|
+
* `deployRoot` belong to, stopped containers included. A container is the
|
|
61
|
+
* deployment's when its working-directory label is the deploy root or under it.
|
|
62
|
+
*
|
|
63
|
+
* Never throws: a Docker that cannot be asked is `unavailable`. Read-only
|
|
64
|
+
* (`docker ps`, `docker inspect`), and argv only, never a shell string.
|
|
65
|
+
*
|
|
66
|
+
* @param deployRoot - The deployment folder (`<apps-root>/<name>`).
|
|
67
|
+
* @param run - The command seam; pass the engine's `runCommand`.
|
|
68
|
+
* @returns the single project found, none, several, or unavailable.
|
|
69
|
+
* @stability experimental
|
|
70
|
+
*/
|
|
71
|
+
export async function detectComposeProject(deployRoot, run) {
|
|
72
|
+
try {
|
|
73
|
+
const ask = (argv) => run(argv, { cwd: process.cwd(), timeoutMs: DOCKER_QUERY_TIMEOUT_MS });
|
|
74
|
+
// `-aq`: every container, whatever its state. Ids, which can never be ambiguous.
|
|
75
|
+
const ids = (await ask(['docker', 'ps', '-aq']))
|
|
76
|
+
.stdout.split('\n')
|
|
77
|
+
.map((line) => line.trim())
|
|
78
|
+
.filter((line) => line !== '');
|
|
79
|
+
if (ids.length === 0)
|
|
80
|
+
return { kind: 'none' };
|
|
81
|
+
// ONE inspect over every id, argv and never a shell string.
|
|
82
|
+
const { stdout } = await ask(['docker', 'inspect', '--format', INSPECT_FORMAT, ...ids]);
|
|
83
|
+
const projects = new Set();
|
|
84
|
+
for (const line of stdout.split('\n')) {
|
|
85
|
+
const separator = line.indexOf('|');
|
|
86
|
+
if (separator === -1)
|
|
87
|
+
continue;
|
|
88
|
+
const project = line.slice(0, separator).trim();
|
|
89
|
+
const workingDir = line.slice(separator + 1).trim();
|
|
90
|
+
if (project === '' || workingDir === '')
|
|
91
|
+
continue;
|
|
92
|
+
if (isPathUnder(workingDir, deployRoot))
|
|
93
|
+
projects.add(project);
|
|
94
|
+
}
|
|
95
|
+
const found = [...projects].sort();
|
|
96
|
+
if (found.length === 0)
|
|
97
|
+
return { kind: 'none' };
|
|
98
|
+
const [only] = found;
|
|
99
|
+
if (found.length === 1 && only !== undefined)
|
|
100
|
+
return { kind: 'found', project: only };
|
|
101
|
+
return { kind: 'ambiguous', projects: found };
|
|
102
|
+
}
|
|
103
|
+
catch {
|
|
104
|
+
return { kind: 'unavailable' };
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Copies the previous state file once to `<file>.bak` (mode 0600) and keeps an
|
|
109
|
+
* existing backup: the one from before the first change is the one worth having.
|
|
110
|
+
*/
|
|
111
|
+
function keepBackup(path) {
|
|
112
|
+
const backup = `${path}.bak`;
|
|
113
|
+
try {
|
|
114
|
+
copyFileSync(path, backup, constants.COPYFILE_EXCL);
|
|
115
|
+
chmodSync(backup, 0o600);
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
if (error.code !== 'EEXIST')
|
|
119
|
+
throw error;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Makes the carried compose project match the one Docker says the deployment
|
|
124
|
+
* runs under, when the record is absent or the legacy default.
|
|
125
|
+
*
|
|
126
|
+
* Changes nothing (the state comes back as given) when there is no state, when
|
|
127
|
+
* a project other than the legacy default is recorded (Docker is not asked),
|
|
128
|
+
* when Docker cannot be asked or knows no container of this folder, or when it
|
|
129
|
+
* already agrees. An ambiguous answer changes nothing and returns a warning
|
|
130
|
+
* naming the projects and the state file (silent when `compose` is among them:
|
|
131
|
+
* the engine's default then works).
|
|
132
|
+
*
|
|
133
|
+
* On `found` with a different project: the returned state carries it, and when
|
|
134
|
+
* a state file is on disk it is rewritten through the engine's own writer (same
|
|
135
|
+
* v2 shape, version not bumped, every other field kept) after the previous file
|
|
136
|
+
* is copied once to `.appctl-deploy.json.bak`. An in-memory state with no file
|
|
137
|
+
* (an adopted deployment) is only corrected; the pipeline records it with its
|
|
138
|
+
* first write. If the file cannot be written the corrected project is still
|
|
139
|
+
* used for this run, since running under the wrong one is the outage, and the
|
|
140
|
+
* message says it was not recorded.
|
|
141
|
+
*
|
|
142
|
+
* Never throws: it must not make a command that worked before fail.
|
|
143
|
+
*
|
|
144
|
+
* @param options - The deployment folder, the loaded state and the command seam.
|
|
145
|
+
* @returns the state to carry, and a one-line message when there is one.
|
|
146
|
+
* @stability experimental
|
|
147
|
+
*/
|
|
148
|
+
export async function reconcileComposeProject(options) {
|
|
149
|
+
const { state } = options;
|
|
150
|
+
try {
|
|
151
|
+
if (state === undefined)
|
|
152
|
+
return { state };
|
|
153
|
+
// A recorded, non-legacy project is a decision: never overwritten, and
|
|
154
|
+
// Docker is not even asked.
|
|
155
|
+
const recorded = state.composeProject;
|
|
156
|
+
if (recorded !== undefined && recorded !== LEGACY_COMPOSE_PROJECT)
|
|
157
|
+
return { state };
|
|
158
|
+
const root = resolve(options.deployRoot);
|
|
159
|
+
const detection = await detectComposeProject(root, options.runCommand);
|
|
160
|
+
const shown = recorded ?? 'none';
|
|
161
|
+
const path = deployStatePath(root);
|
|
162
|
+
if (detection.kind === 'ambiguous') {
|
|
163
|
+
// The engine's effective project is among them: its default works, nothing to say.
|
|
164
|
+
if (detection.projects.includes(LEGACY_COMPOSE_PROJECT))
|
|
165
|
+
return { state };
|
|
166
|
+
return {
|
|
167
|
+
state,
|
|
168
|
+
message: `warning: containers of ${root} run under several compose projects ` +
|
|
169
|
+
`(${detection.projects.join(', ')}); the state file records ${shown}, so the compose project was not changed. ` +
|
|
170
|
+
`Set "composeProject" in ${path} to the right one.`,
|
|
171
|
+
};
|
|
172
|
+
}
|
|
173
|
+
if (detection.kind !== 'found' || detection.project === LEGACY_COMPOSE_PROJECT)
|
|
174
|
+
return { state };
|
|
175
|
+
const reconciled = { ...state, composeProject: detection.project };
|
|
176
|
+
const note = `note: recorded compose project ${detection.project} for ${root} (its containers run under it; the state file had ${shown}).`;
|
|
177
|
+
// No file on disk, or one whose recorded root is elsewhere (a moved
|
|
178
|
+
// folder): `writeState` writes to `state.deployRoot`, and creating that
|
|
179
|
+
// directory somewhere else is worse than not recording. Carry it in memory.
|
|
180
|
+
if (!existsSync(path) || resolve(state.deployRoot) !== root)
|
|
181
|
+
return { state: reconciled, message: note };
|
|
182
|
+
try {
|
|
183
|
+
keepBackup(path);
|
|
184
|
+
writeState(reconciled);
|
|
185
|
+
}
|
|
186
|
+
catch (error) {
|
|
187
|
+
return {
|
|
188
|
+
state: reconciled,
|
|
189
|
+
message: `warning: containers of ${root} run under compose project ${detection.project}, which is used for this run, ` +
|
|
190
|
+
`but it could not be recorded in ${path}: ${error instanceof Error ? error.message : String(error)}`,
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
return { state: reconciled, message: note };
|
|
194
|
+
}
|
|
195
|
+
catch {
|
|
196
|
+
return { state };
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
//# sourceMappingURL=compose-project.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose-project.js","sourceRoot":"","sources":["../../../src/engine/deploy/compose-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/engine/deploy/install.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/engine/deploy/install.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAQL,KAAK,cAAc,EACpB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAA4C,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAUxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAOL,KAAK,SAAS,EACd,KAAK,YAAY,EAEjB,KAAK,oBAAoB,EAC1B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAmE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAE7G,OAAO,EAKL,KAAK,WAAW,EAChB,KAAK,SAAS,EACf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAe,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGrF,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA4BlD,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC,gFAAgF;IAChF,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,SAAS,QAAQ,EAAE,GAAG,SAAS,CAAC;IACzC,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,iBAAiB,GAAG,SAAS,CAAC;IAClD,KAAK,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,kFAAkF;IAClF,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAClD;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,6DAA6D;IAC7D,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,iFAAiF;IACjF,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,8EAA8E;IAC9E,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAC5D;AAED,UAAU,cAAe,SAAQ,WAAW;IAC1C,0FAA0F;IAC1F,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,OAAO,iBAAiB,CAAC;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACtC,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,mEAAmE;IACnE,OAAO,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACxC,8EAA8E;IAC9E,aAAa,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC;IAC9E,yDAAyD;IACzD,YAAY,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChD,6EAA6E;IAC7E,aAAa,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,uDAAuD;IACvD,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5C,2EAA2E;IAC3E,qBAAqB,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACnD;;;;OAIG;IACH,cAAc,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAChE,qFAAqF;IACrF,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAmHD,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAIrD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,sBAAsB,YAAY,CAAC;AAEhD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,GACzD,MAAM,CAER;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACtC,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,EAAE,CASV;AAyFD,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,EAAE,CAI3E;AA+BD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG;IACtC,UAAU,EAAE,OAAO,iBAAiB,CAAC;IACrC,OAAO,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC,EACD,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACrC,OAAO,CAAC,IAAI,CAAC,CAUf;AA4BD,wBAAgB,iBAAiB,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CA+vBhE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE;IAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;CAAE,EAClD,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GACzB,cAAc,CAOhB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,OAAO,GAAG,SAAS,EACzB,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GAC3C;IAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,EAC/C,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,IAAI,CAUN;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG;IAAE,UAAU,EAAE,OAAO,iBAAiB,CAAA;CAAE,EAC1F,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CAC9D;AAED,wBAAsB,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CA+OlF;AAgCD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGpE"}
|
|
@@ -381,6 +381,8 @@ export function buildInstallSteps() {
|
|
|
381
381
|
runCommand: context.runCommand,
|
|
382
382
|
deployRoot: context.options.deployRoot,
|
|
383
383
|
bindPort: context.options.bindPort,
|
|
384
|
+
// What this install will record, so install and doctor agree.
|
|
385
|
+
composeProject: context.composeProject,
|
|
384
386
|
proxyRoot: context.options.proxyRoot,
|
|
385
387
|
// Resolved before the checks, because it decides which of them are
|
|
386
388
|
// required: certbot-installed only on the host, renewal-path hygiene
|
|
@@ -601,6 +603,7 @@ export function buildInstallSteps() {
|
|
|
601
603
|
runCommand: context.runCommand,
|
|
602
604
|
deployRoot: context.options.deployRoot,
|
|
603
605
|
bindPort: context.options.bindPort,
|
|
606
|
+
composeProject: context.composeProject,
|
|
604
607
|
proxyRoot: context.options.proxyRoot,
|
|
605
608
|
env: context.env,
|
|
606
609
|
...(context.options.allowSuperuser === true ? { allowSuperuser: true } : {}),
|
|
@@ -1109,9 +1112,8 @@ export async function runInstall(requested) {
|
|
|
1109
1112
|
// A FRESH install gets its own compose project; anything already here keeps
|
|
1110
1113
|
// the one it is running under. See composeProjectFor for why renaming an
|
|
1111
1114
|
// existing deployment's project is an outage rather than a tidy-up.
|
|
1112
|
-
const
|
|
1113
|
-
|
|
1114
|
-
: composeProjectFor(existingState);
|
|
1115
|
+
const freshProject = existingState === undefined && !isDeployment(options.deployRoot);
|
|
1116
|
+
const composeProject = freshProject ? basename(options.deployRoot) : composeProjectFor(existingState);
|
|
1115
1117
|
const context = {
|
|
1116
1118
|
options,
|
|
1117
1119
|
runCommand: options.runCommand ?? defaultRunCommand,
|
|
@@ -1165,7 +1167,14 @@ export async function runInstall(requested) {
|
|
|
1165
1167
|
lastDeployedAt: existingState?.lastDeployedAt ?? '',
|
|
1166
1168
|
lastCommand: 'install',
|
|
1167
1169
|
appctlVersion: cliVersion(),
|
|
1168
|
-
|
|
1170
|
+
// ⚠ ONLY A NAME THIS RUN CHOSE IS A RECORD. For a deployment that was
|
|
1171
|
+
// already here, `composeProject` above is the legacy `compose` assumed
|
|
1172
|
+
// for an absent value, and writing it back from a FAILED attempt made
|
|
1173
|
+
// a guess look recorded: later runs then could not tell "the operator
|
|
1174
|
+
// pinned compose" from "nothing was ever recorded", and a server
|
|
1175
|
+
// running under an app-named project kept being driven as `compose`.
|
|
1176
|
+
// The spread of `existingState` above already keeps a real record.
|
|
1177
|
+
...(freshProject ? { composeProject } : {}),
|
|
1169
1178
|
...(options.domain === undefined ? {} : { domain: options.domain }),
|
|
1170
1179
|
...(options.proxyRoot === undefined ? {} : { proxyRoot: options.proxyRoot }),
|
|
1171
1180
|
...recordedRuntime(context),
|