@sitepong/cli 0.1.34 → 0.1.36
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/commands/servernet/compose.js +169 -0
- package/dist/commands/servernet/compose.js.map +1 -0
- package/dist/commands/servernet/compose.test.js +58 -0
- package/dist/commands/servernet/compose.test.js.map +1 -0
- package/dist/commands/servernet/index.js +141 -4
- package/dist/commands/servernet/index.js.map +1 -1
- package/dist/commands/servernet/servernet.test.js +33 -1
- package/dist/commands/servernet/servernet.test.js.map +1 -1
- package/package.json +3 -2
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Turns a Compose file into a ServerNet stack. Only a subset of Compose is
|
|
3
|
+
* accepted, and anything else is refused by name with the reason, so a file never
|
|
4
|
+
* deploys with a setting quietly dropped.
|
|
5
|
+
*
|
|
6
|
+
* Settings for the whole stack go under a top-level `x-sitepong` key:
|
|
7
|
+
* x-sitepong: { public: web, health: /health, drainSeconds: 30 }
|
|
8
|
+
*/
|
|
9
|
+
import { parse } from 'yaml';
|
|
10
|
+
/** Refused, with why. Everything else not listed in ACCEPTED is refused too. */
|
|
11
|
+
const REFUSED = {
|
|
12
|
+
privileged: 'containers never run privileged',
|
|
13
|
+
cap_add: 'containers get no extra capabilities',
|
|
14
|
+
devices: 'containers get no host devices',
|
|
15
|
+
network_mode: 'each slot has its own network, and the host network is never shared',
|
|
16
|
+
networks: 'each slot has its own network, so services find each other by name',
|
|
17
|
+
pid: 'containers never share the host’s processes',
|
|
18
|
+
ipc: 'containers never share the host’s IPC',
|
|
19
|
+
security_opt: 'security options are set by ServerNet',
|
|
20
|
+
build: 'build in CI and push, then name the image here',
|
|
21
|
+
env_file: 'set values with `sitepong servernet env set`, and list the names under environment',
|
|
22
|
+
extra_hosts: 'services find each other by name, and nothing else on the host network is reachable',
|
|
23
|
+
sysctls: 'kernel settings are the host’s',
|
|
24
|
+
ulimits: 'limits are set by ServerNet',
|
|
25
|
+
userns_mode: 'containers can’t share the host’s user namespace',
|
|
26
|
+
cgroup_parent: 'limits are set by ServerNet',
|
|
27
|
+
tmpfs: 'not supported yet',
|
|
28
|
+
};
|
|
29
|
+
const ACCEPTED = ['image', 'ports', 'expose', 'environment', 'command', 'volumes', 'user', 'deploy', 'depends_on', 'restart', 'healthcheck', 'container_name', 'x-sitepong'];
|
|
30
|
+
const STACK_KEYS = ['public', 'health', 'drainSeconds', 'startTimeoutSeconds', 'healthyChecks', 'soakSeconds'];
|
|
31
|
+
export class ComposeError extends Error {
|
|
32
|
+
}
|
|
33
|
+
function containerPort(spec) {
|
|
34
|
+
if (typeof spec === 'number')
|
|
35
|
+
return spec;
|
|
36
|
+
if (spec && typeof spec === 'object' && 'target' in spec)
|
|
37
|
+
return Number(spec.target);
|
|
38
|
+
const s = String(spec).replace(/\/tcp$/, '');
|
|
39
|
+
if (s.endsWith('/udp'))
|
|
40
|
+
throw new ComposeError('UDP ports aren’t supported');
|
|
41
|
+
return Number(s.split(':').pop());
|
|
42
|
+
}
|
|
43
|
+
function memoryMb(v) {
|
|
44
|
+
const m = /^(\d+(?:\.\d+)?)\s*([kmg]?)b?$/i.exec(String(v).trim());
|
|
45
|
+
if (!m)
|
|
46
|
+
throw new ComposeError(`can’t read memory limit ${String(v)}`);
|
|
47
|
+
const n = Number(m[1]);
|
|
48
|
+
const unit = (m[2] ?? '').toLowerCase();
|
|
49
|
+
return Math.round(unit === 'g' ? n * 1024 : unit === 'k' ? n / 1024 : unit === 'm' ? n : n / 1048576);
|
|
50
|
+
}
|
|
51
|
+
function envNames(name, environment) {
|
|
52
|
+
const entries = Array.isArray(environment)
|
|
53
|
+
? environment.map((e) => {
|
|
54
|
+
const [k, ...rest] = String(e).split('=');
|
|
55
|
+
return [k ?? '', rest.length ? rest.join('=') : null];
|
|
56
|
+
})
|
|
57
|
+
: Object.entries((environment ?? {}));
|
|
58
|
+
return entries.map(([k, v]) => {
|
|
59
|
+
// A value written here would end up in the release record, not in the secret store.
|
|
60
|
+
if (v !== null && v !== undefined && v !== '' && v !== `\${${k}}` && v !== `$${k}`) {
|
|
61
|
+
throw new ComposeError(`${name}: ${k} has a value. Set values with \`sitepong servernet env set\` and list only the name here`);
|
|
62
|
+
}
|
|
63
|
+
return k;
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
/** Image tags are resolved to digests by the caller, after this. */
|
|
67
|
+
export function composeToStack(text) {
|
|
68
|
+
const doc = parse(text);
|
|
69
|
+
if (!doc || typeof doc !== 'object')
|
|
70
|
+
throw new ComposeError('the compose file is empty');
|
|
71
|
+
const x = (doc['x-sitepong'] ?? {});
|
|
72
|
+
const extraTop = Object.keys(x).find((k) => !STACK_KEYS.includes(k));
|
|
73
|
+
if (extraTop)
|
|
74
|
+
throw new ComposeError(`x-sitepong: ${extraTop} isn’t a stack setting`);
|
|
75
|
+
for (const k of ['networks', 'configs', 'secrets']) {
|
|
76
|
+
if (doc[k] !== undefined)
|
|
77
|
+
throw new ComposeError(`top-level ${k} isn’t supported: ${REFUSED.networks}`);
|
|
78
|
+
}
|
|
79
|
+
const declaredVolumes = Object.keys((doc.volumes ?? {}));
|
|
80
|
+
const raw = (doc.services ?? {});
|
|
81
|
+
if (!Object.keys(raw).length)
|
|
82
|
+
throw new ComposeError('the compose file has no services');
|
|
83
|
+
const withPorts = Object.entries(raw).filter(([, s]) => s?.ports !== undefined).map(([n]) => n);
|
|
84
|
+
const publicName = x.public ?? (withPorts.length === 1 ? withPorts[0] : undefined);
|
|
85
|
+
if (!publicName) {
|
|
86
|
+
throw new ComposeError(withPorts.length
|
|
87
|
+
? `more than one service has ports (${withPorts.join(', ')}). Say which is public with x-sitepong: { public: <name> }`
|
|
88
|
+
: 'no service has ports. Give the public one its port, or name it with x-sitepong: { public: <name> }');
|
|
89
|
+
}
|
|
90
|
+
if (!raw[publicName])
|
|
91
|
+
throw new ComposeError(`x-sitepong.public names ${publicName}, which isn’t a service`);
|
|
92
|
+
const services = {};
|
|
93
|
+
for (const [name, s] of Object.entries(raw)) {
|
|
94
|
+
if (!s || typeof s !== 'object')
|
|
95
|
+
throw new ComposeError(`${name} must be a mapping`);
|
|
96
|
+
for (const k of Object.keys(s)) {
|
|
97
|
+
if (REFUSED[k])
|
|
98
|
+
throw new ComposeError(`${name}: ${k} isn’t supported: ${REFUSED[k]}`);
|
|
99
|
+
if (!ACCEPTED.includes(k))
|
|
100
|
+
throw new ComposeError(`${name}: ${k} isn’t supported`);
|
|
101
|
+
}
|
|
102
|
+
if (typeof s.image !== 'string')
|
|
103
|
+
throw new ComposeError(`${name}: needs an image`);
|
|
104
|
+
const out = { image: s.image };
|
|
105
|
+
const isPublic = name === publicName;
|
|
106
|
+
const ports = (s.ports ?? []);
|
|
107
|
+
const sx = (s['x-sitepong'] ?? {});
|
|
108
|
+
if (isPublic) {
|
|
109
|
+
if (ports.length !== 1)
|
|
110
|
+
throw new ComposeError(`${name}: the public service has exactly one port`);
|
|
111
|
+
out.public = true;
|
|
112
|
+
out.port = containerPort(ports[0]);
|
|
113
|
+
}
|
|
114
|
+
else if (ports.length) {
|
|
115
|
+
throw new ComposeError(`${name}: only the public service has ports. Others are reached by name, like http://${name}:<port>`);
|
|
116
|
+
}
|
|
117
|
+
if (!isPublic && s.expose !== undefined) {
|
|
118
|
+
const exp = s.expose ?? [];
|
|
119
|
+
if (exp.length)
|
|
120
|
+
out.port = containerPort(exp[0]);
|
|
121
|
+
}
|
|
122
|
+
if (s.environment !== undefined)
|
|
123
|
+
out.env = envNames(name, s.environment);
|
|
124
|
+
if (s.command !== undefined) {
|
|
125
|
+
if (Array.isArray(s.command))
|
|
126
|
+
out.command = s.command.map(String);
|
|
127
|
+
else
|
|
128
|
+
out.command = String(s.command).trim().split(/\s+/);
|
|
129
|
+
}
|
|
130
|
+
if (s.user !== undefined)
|
|
131
|
+
out.user = String(s.user);
|
|
132
|
+
if (sx.user === 'image')
|
|
133
|
+
out.user = 'image';
|
|
134
|
+
const limits = s.deploy?.resources?.limits;
|
|
135
|
+
if (limits?.memory !== undefined)
|
|
136
|
+
out.memoryMb = memoryMb(limits.memory);
|
|
137
|
+
if (limits?.cpus !== undefined)
|
|
138
|
+
out.cpus = Number(limits.cpus);
|
|
139
|
+
if (s.volumes !== undefined) {
|
|
140
|
+
const vols = {};
|
|
141
|
+
for (const v of s.volumes) {
|
|
142
|
+
const spec = typeof v === 'string' ? v : `${v.source ?? ''}:${v.target ?? ''}`;
|
|
143
|
+
const [src, dest, mode] = spec.split(':');
|
|
144
|
+
if (!src || !dest)
|
|
145
|
+
throw new ComposeError(`${name}: a volume needs a name and a path`);
|
|
146
|
+
if (src.startsWith('/') || src.startsWith('.') || src.startsWith('~')) {
|
|
147
|
+
throw new ComposeError(`${name}: ${src} is a folder on the host, and only named volumes are supported`);
|
|
148
|
+
}
|
|
149
|
+
if (mode && mode !== 'rw')
|
|
150
|
+
throw new ComposeError(`${name}: volume mode ${mode} isn’t supported`);
|
|
151
|
+
if (!declaredVolumes.includes(src))
|
|
152
|
+
throw new ComposeError(`${name}: volume ${src} isn’t declared under the top-level volumes`);
|
|
153
|
+
vols[src] = dest;
|
|
154
|
+
}
|
|
155
|
+
if (Object.keys(vols).length)
|
|
156
|
+
out.volumes = vols;
|
|
157
|
+
}
|
|
158
|
+
if (sx.publish === true)
|
|
159
|
+
out.publish = true;
|
|
160
|
+
services[name] = out;
|
|
161
|
+
}
|
|
162
|
+
const config = { services };
|
|
163
|
+
for (const k of STACK_KEYS) {
|
|
164
|
+
if (k !== 'public' && x[k] !== undefined)
|
|
165
|
+
config[k] = x[k];
|
|
166
|
+
}
|
|
167
|
+
return config;
|
|
168
|
+
}
|
|
169
|
+
//# sourceMappingURL=compose.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/commands/servernet/compose.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAuB7B,gFAAgF;AAChF,MAAM,OAAO,GAA2B;IACtC,UAAU,EAAE,iCAAiC;IAC7C,OAAO,EAAE,sCAAsC;IAC/C,OAAO,EAAE,gCAAgC;IACzC,YAAY,EAAE,qEAAqE;IACnF,QAAQ,EAAE,oEAAoE;IAC9E,GAAG,EAAE,6CAA6C;IAClD,GAAG,EAAE,uCAAuC;IAC5C,YAAY,EAAE,uCAAuC;IACrD,KAAK,EAAE,gDAAgD;IACvD,QAAQ,EAAE,oFAAoF;IAC9F,WAAW,EAAE,qFAAqF;IAClG,OAAO,EAAE,gCAAgC;IACzC,OAAO,EAAE,6BAA6B;IACtC,WAAW,EAAE,kDAAkD;IAC/D,aAAa,EAAE,6BAA6B;IAC5C,KAAK,EAAE,mBAAmB;CAC3B,CAAC;AACF,MAAM,QAAQ,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AAC7K,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,qBAAqB,EAAE,eAAe,EAAE,aAAa,CAAU,CAAC;AAExH,MAAM,OAAO,YAAa,SAAQ,KAAK;CAAG;AAE1C,SAAS,aAAa,CAAC,IAAa;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,MAAM,CAAE,IAA4B,CAAC,MAAM,CAAC,CAAC;IAC9G,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC7C,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,YAAY,CAAC,4BAA4B,CAAC,CAAC;IAC7E,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU;IAC1B,MAAM,CAAC,GAAG,iCAAiC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACnE,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,YAAY,CAAC,2BAA2B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACvE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACxC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,WAAoB;IAClD,MAAM,OAAO,GAAwB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QAC7D,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACtB,MAAM,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC,CAAC;QACF,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,IAAI,EAAE,CAA4B,CAAC,CAAC;IACnE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QAC5B,oFAAoF;QACpF,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YACnF,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAC;QAClI,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAmC,CAAC;IAC1D,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,MAAM,IAAI,YAAY,CAAC,2BAA2B,CAAC,CAAC;IACzF,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAA4B,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,UAAgC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5F,IAAI,QAAQ;QAAE,MAAM,IAAI,YAAY,CAAC,eAAe,QAAQ,wBAAwB,CAAC,CAAC;IACtF,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;QACnD,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS;YAAE,MAAM,IAAI,YAAY,CAAC,aAAa,CAAC,qBAAqB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAC,CAAC;IACpF,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAA4C,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM;QAAE,MAAM,IAAI,YAAY,CAAC,kCAAkC,CAAC,CAAC;IAEzF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAChG,MAAM,UAAU,GAAI,CAAC,CAAC,MAA6B,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3G,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,MAAM;YACrC,CAAC,CAAC,oCAAoC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,4DAA4D;YACtH,CAAC,CAAC,oGAAoG,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,MAAM,IAAI,YAAY,CAAC,2BAA2B,UAAU,yBAAyB,CAAC,CAAC;IAE7G,MAAM,QAAQ,GAAiC,EAAE,CAAC;IAClD,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,oBAAoB,CAAC,CAAC;QACrF,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,CAAC,CAAC;gBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,KAAK,CAAC,qBAAqB,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvF,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ;YAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,kBAAkB,CAAC,CAAC;QACnF,MAAM,GAAG,GAAiB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,KAAK,UAAU,CAAC;QACrC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAc,CAAC;QAC3C,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,CAA4B,CAAC;QAC9D,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,2CAA2C,CAAC,CAAC;YACnG,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;YAClB,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,gFAAgF,IAAI,SAAS,CAAC,CAAC;QAC/H,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,GAAG,GAAI,CAAC,CAAC,MAAoB,IAAI,EAAE,CAAC;YAC1C,IAAI,GAAG,CAAC,MAAM;gBAAE,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS;YAAE,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;QACzE,IAAI,CAAC,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBAAE,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;;gBAC7D,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS;YAAE,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,EAAE,CAAC,IAAI,KAAK,OAAO;YAAE,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QAC5C,MAAM,MAAM,GAAK,CAAC,CAAC,MAA8C,EAAE,SAAiD,EAAE,MAA6C,CAAC;QACpK,IAAI,MAAM,EAAE,MAAM,KAAK,SAAS;YAAE,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzE,IAAI,MAAM,EAAE,IAAI,KAAK,SAAS;YAAE,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,GAA2B,EAAE,CAAC;YACxC,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,OAAoB,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAI,CAAyB,CAAC,MAAM,IAAI,EAAE,IAAK,CAAyB,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;gBACjI,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI;oBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,oCAAoC,CAAC,CAAC;gBACvF,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,KAAK,GAAG,gEAAgE,CAAC,CAAC;gBAC1G,CAAC;gBACD,IAAI,IAAI,IAAI,IAAI,KAAK,IAAI;oBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,iBAAiB,IAAI,kBAAkB,CAAC,CAAC;gBAClG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,YAAY,GAAG,6CAA6C,CAAC,CAAC;gBAChI,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YACnB,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM;gBAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;QACnD,CAAC;QACD,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI;YAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;QAC5C,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;IACvB,CAAC;IACD,MAAM,MAAM,GAAgB,EAAE,QAAQ,EAAE,CAAC;IACzC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS;YAAG,MAA6C,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { composeToStack } from './compose.js';
|
|
3
|
+
const D = 'a'.repeat(64);
|
|
4
|
+
describe('composeToStack', () => {
|
|
5
|
+
it('turns a web, a worker and a database into a stack with one public service', () => {
|
|
6
|
+
const s = composeToStack(`
|
|
7
|
+
x-sitepong: { health: /ready, drainSeconds: 20 }
|
|
8
|
+
services:
|
|
9
|
+
web:
|
|
10
|
+
image: ghcr.io/acme/web@sha256:${D}
|
|
11
|
+
ports: ["8080:3000"]
|
|
12
|
+
environment: [DATABASE_URL, SESSION_SECRET]
|
|
13
|
+
deploy: { resources: { limits: { memory: 256M, cpus: "0.5" } } }
|
|
14
|
+
depends_on: [db]
|
|
15
|
+
worker:
|
|
16
|
+
image: ghcr.io/acme/web:v2
|
|
17
|
+
command: node worker.js
|
|
18
|
+
environment: { DATABASE_URL: "\${DATABASE_URL}" }
|
|
19
|
+
db:
|
|
20
|
+
image: postgres:17
|
|
21
|
+
user: "999"
|
|
22
|
+
expose: ["5432"]
|
|
23
|
+
environment: [POSTGRES_PASSWORD]
|
|
24
|
+
volumes: ["pgdata:/var/lib/postgresql/data"]
|
|
25
|
+
volumes:
|
|
26
|
+
pgdata: {}
|
|
27
|
+
`);
|
|
28
|
+
expect(s.health).toBe('/ready');
|
|
29
|
+
expect(s.drainSeconds).toBe(20);
|
|
30
|
+
expect(s.services.web).toEqual({ image: `ghcr.io/acme/web@sha256:${D}`, public: true, port: 3000, env: ['DATABASE_URL', 'SESSION_SECRET'], memoryMb: 256, cpus: 0.5 });
|
|
31
|
+
expect(s.services.worker.command).toEqual(['node', 'worker.js']);
|
|
32
|
+
expect(s.services.worker.env).toEqual(['DATABASE_URL']);
|
|
33
|
+
expect(s.services.db).toMatchObject({ port: 5432, user: '999', volumes: { pgdata: '/var/lib/postgresql/data' } });
|
|
34
|
+
});
|
|
35
|
+
it.each([
|
|
36
|
+
['privileged: true', /never run privileged/],
|
|
37
|
+
['network_mode: host', /own network/],
|
|
38
|
+
['build: .', /build in CI/],
|
|
39
|
+
['env_file: .env', /env set/],
|
|
40
|
+
['cap_add: [NET_ADMIN]', /capabilities/],
|
|
41
|
+
['volumes: ["/var/run/docker.sock:/var/run/docker.sock"]', /folder on the host/],
|
|
42
|
+
['volumes: ["./data:/data"]', /folder on the host/],
|
|
43
|
+
['environment: { API_KEY: sk_live_123 }', /has a value/],
|
|
44
|
+
['labels: { a: b }', /labels isn’t supported/],
|
|
45
|
+
])('refuses %s, saying why', (line, why) => {
|
|
46
|
+
expect(() => composeToStack(`services:\n web:\n image: x@sha256:${D}\n ports: ["80"]\n ${line}\n`)).toThrow(why);
|
|
47
|
+
});
|
|
48
|
+
it('asks which service is public when more than one has ports', () => {
|
|
49
|
+
const two = `services:\n a: { image: a, ports: ["1"] }\n b: { image: b, ports: ["2"] }\n`;
|
|
50
|
+
expect(() => composeToStack(two)).toThrow(/x-sitepong/);
|
|
51
|
+
expect(() => composeToStack(`x-sitepong: { public: a }\n${two}`)).toThrow(/only the public service has ports/);
|
|
52
|
+
});
|
|
53
|
+
it('refuses a volume that isn’t declared, and top-level networks', () => {
|
|
54
|
+
expect(() => composeToStack(`services:\n web: { image: a, ports: ["1"], volumes: ["d:/d"] }\n`)).toThrow(/declared/);
|
|
55
|
+
expect(() => composeToStack(`networks: { x: {} }\nservices:\n web: { image: a, ports: ["1"] }\n`)).toThrow(/networks/);
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
//# sourceMappingURL=compose.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose.test.js","sourceRoot":"","sources":["../../../src/commands/servernet/compose.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAEzB,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACnF,MAAM,CAAC,GAAG,cAAc,CAAC;;;;qCAIQ,CAAC;;;;;;;;;;;;;;;;;CAiBrC,CAAC,CAAC;QACC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,2BAA2B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACvK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAClE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;IACpH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;QAC5C,CAAC,oBAAoB,EAAE,aAAa,CAAC;QACrC,CAAC,UAAU,EAAE,aAAa,CAAC;QAC3B,CAAC,gBAAgB,EAAE,SAAS,CAAC;QAC7B,CAAC,sBAAsB,EAAE,cAAc,CAAC;QACxC,CAAC,wDAAwD,EAAE,oBAAoB,CAAC;QAChF,CAAC,2BAA2B,EAAE,oBAAoB,CAAC;QACnD,CAAC,uCAAuC,EAAE,aAAa,CAAC;QACxD,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;KAC/C,CAAC,CAAC,wBAAwB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,0CAA0C,CAAC,4BAA4B,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7H,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,GAAG,GAAG,+EAA+E,CAAC;QAC5F,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;IACjH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,mEAAmE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtH,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,qEAAqE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1H,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -19,6 +19,57 @@ export function packageRelease(source) {
|
|
|
19
19
|
execFileSync('tar', ['-czf', file, '-C', source, '.'], { env: { ...process.env, COPYFILE_DISABLE: '1' } });
|
|
20
20
|
return { file, temporary: true };
|
|
21
21
|
}
|
|
22
|
+
const DIGEST_RE = /@sha256:[0-9a-f]{64}$/;
|
|
23
|
+
const MANIFEST_ACCEPT = [
|
|
24
|
+
'application/vnd.oci.image.index.v1+json', 'application/vnd.docker.distribution.manifest.list.v2+json',
|
|
25
|
+
'application/vnd.oci.image.manifest.v1+json', 'application/vnd.docker.distribution.manifest.v2+json',
|
|
26
|
+
].join(', ');
|
|
27
|
+
/** Splits an image reference the way Docker reads it. No host means Docker Hub. */
|
|
28
|
+
export function parseImageRef(ref) {
|
|
29
|
+
const parts = ref.split('/');
|
|
30
|
+
const hasHost = parts.length > 1 && (parts[0].includes('.') || parts[0].includes(':') || parts[0] === 'localhost');
|
|
31
|
+
const registry = hasHost ? parts.shift() : 'registry-1.docker.io';
|
|
32
|
+
const rest = parts.join('/');
|
|
33
|
+
const colon = rest.lastIndexOf(':');
|
|
34
|
+
const name = colon === -1 ? rest : rest.slice(0, colon);
|
|
35
|
+
const tag = colon === -1 ? 'latest' : rest.slice(colon + 1);
|
|
36
|
+
const repository = !hasHost && !name.includes('/') ? `library/${name}` : name;
|
|
37
|
+
return { registry, repository, tag };
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* A tag can move and a rollback must return to the same bytes, so what deploys is
|
|
41
|
+
* always the digest. Anonymous, so a private image has to be given by digest.
|
|
42
|
+
*/
|
|
43
|
+
export async function resolveImageDigest(ref, fetcher = fetch) {
|
|
44
|
+
if (DIGEST_RE.test(ref))
|
|
45
|
+
return ref;
|
|
46
|
+
const { registry, repository, tag } = parseImageRef(ref);
|
|
47
|
+
const url = `https://${registry}/v2/${repository}/manifests/${tag}`;
|
|
48
|
+
const headers = { Accept: MANIFEST_ACCEPT };
|
|
49
|
+
let res = await fetcher(url, { method: 'HEAD', headers });
|
|
50
|
+
if (res.status === 401) {
|
|
51
|
+
const challenge = res.headers.get('www-authenticate') ?? '';
|
|
52
|
+
const field = (k) => new RegExp(`${k}="([^"]+)"`).exec(challenge)?.[1];
|
|
53
|
+
const realm = field('realm');
|
|
54
|
+
if (!realm)
|
|
55
|
+
throw new Error(`${registry} wants credentials we can't get. Give the image by digest.`);
|
|
56
|
+
const q = new URLSearchParams({ service: field('service') ?? registry, scope: field('scope') ?? `repository:${repository}:pull` });
|
|
57
|
+
const token = await fetcher(`${realm}?${q}`);
|
|
58
|
+
if (!token.ok)
|
|
59
|
+
throw new Error(`${ref} isn't public. Give it by digest.`);
|
|
60
|
+
const body = (await token.json());
|
|
61
|
+
headers.Authorization = `Bearer ${body.token ?? body.access_token}`;
|
|
62
|
+
res = await fetcher(url, { method: 'HEAD', headers });
|
|
63
|
+
}
|
|
64
|
+
if (!res.ok)
|
|
65
|
+
throw new Error(`Couldn't find ${ref}: ${res.status}. A private image has to be given by digest.`);
|
|
66
|
+
const digest = res.headers.get('docker-content-digest');
|
|
67
|
+
if (!digest)
|
|
68
|
+
throw new Error(`${registry} didn't say what digest ${ref} is. Give it by digest.`);
|
|
69
|
+
const colon = ref.lastIndexOf(':');
|
|
70
|
+
const name = colon > ref.lastIndexOf('/') ? ref.slice(0, colon) : ref;
|
|
71
|
+
return `${name}@${digest}`;
|
|
72
|
+
}
|
|
22
73
|
/** Terminal states. CI passes only on succeeded. */
|
|
23
74
|
export const finished = (status) => status !== 'preparing' && status !== 'running';
|
|
24
75
|
/** The upload, retried: a dropped connection shouldn't fail a CI deploy. Returns what went wrong. */
|
|
@@ -115,7 +166,12 @@ export function registerServerNet(parent) {
|
|
|
115
166
|
const res = await hostingClient().put(`${API}/${id}/env`, { body: vars });
|
|
116
167
|
console.log(`Env version ${res.data.version}: ${res.data.names.length} variables. Deploy to apply it.`);
|
|
117
168
|
});
|
|
118
|
-
net.command('deploy <app> [source]').description('
|
|
169
|
+
net.command('deploy <app> [source]').description('Deploy a release: a package, or a Docker image with --image')
|
|
170
|
+
.option('--image <ref>', 'Run this image instead of a package. A tag is resolved to its digest now.')
|
|
171
|
+
.option('--compose <file>', 'Run the services in this Compose file together, one of them public. Tags are resolved to digests now.')
|
|
172
|
+
.option('--port <port>', 'The port the image listens on (needed with --image)')
|
|
173
|
+
.option('--health <path>', 'Health check path for the image')
|
|
174
|
+
.option('--image-user <user>', 'Run as this user, or "image" for the image\'s own. Defaults to nobody.')
|
|
119
175
|
.option('--label <label>', 'Release label (defaults to the git commit or a timestamp)')
|
|
120
176
|
.option('--release <label>', 'Deploy a release already uploaded, instead of uploading')
|
|
121
177
|
.option('--no-wait', "Return as soon as it starts, instead of waiting and failing if it fails")
|
|
@@ -123,7 +179,40 @@ export function registerServerNet(parent) {
|
|
|
123
179
|
const { hostingClient } = await import('../../client/hosting.js');
|
|
124
180
|
const id = await appIdFor(app);
|
|
125
181
|
let label = opts.release;
|
|
126
|
-
if (
|
|
182
|
+
if (opts.compose) {
|
|
183
|
+
const { composeToStack, ComposeError } = await import('./compose.js');
|
|
184
|
+
let config;
|
|
185
|
+
try {
|
|
186
|
+
config = composeToStack(fs.readFileSync(opts.compose, 'utf8'));
|
|
187
|
+
}
|
|
188
|
+
catch (e) {
|
|
189
|
+
console.error(e instanceof ComposeError ? `${opts.compose}: ${e.message}` : String(e));
|
|
190
|
+
process.exit(1);
|
|
191
|
+
}
|
|
192
|
+
for (const svc of Object.values(config.services))
|
|
193
|
+
svc.image = await resolveImageDigest(svc.image);
|
|
194
|
+
label = opts.label ?? defaultLabel();
|
|
195
|
+
await hostingClient().post(`${API}/${id}/releases`, { body: { label, config, git_sha: gitSha() } });
|
|
196
|
+
for (const [name, svc] of Object.entries(config.services))
|
|
197
|
+
console.log(` ${name}${svc.public ? ' (public)' : ''}: ${svc.image}`);
|
|
198
|
+
console.log(`Release ${label}: a stack of ${Object.keys(config.services).length}`);
|
|
199
|
+
}
|
|
200
|
+
else if (opts.image) {
|
|
201
|
+
if (!opts.port) {
|
|
202
|
+
console.error('--image needs --port, the port the image listens on.');
|
|
203
|
+
process.exit(1);
|
|
204
|
+
}
|
|
205
|
+
const image = await resolveImageDigest(opts.image);
|
|
206
|
+
label = opts.label ?? defaultLabel();
|
|
207
|
+
const config = {
|
|
208
|
+
port: Number(opts.port),
|
|
209
|
+
...(opts.health ? { health: opts.health } : {}),
|
|
210
|
+
...(opts.imageUser ? { user: opts.imageUser } : {}),
|
|
211
|
+
};
|
|
212
|
+
await hostingClient().post(`${API}/${id}/releases`, { body: { label, image, config, git_sha: gitSha() } });
|
|
213
|
+
console.log(`Release ${label}: ${image}`);
|
|
214
|
+
}
|
|
215
|
+
else if (!label) {
|
|
127
216
|
const { file, temporary } = packageRelease(source ?? '.');
|
|
128
217
|
const bytes = fs.readFileSync(file);
|
|
129
218
|
label = opts.label ?? defaultLabel();
|
|
@@ -166,13 +255,61 @@ export function registerServerNet(parent) {
|
|
|
166
255
|
const res = await hostingClient().get(`${API}/${await appIdFor(app)}/deployments`);
|
|
167
256
|
output(res.data, ['id', 'kind', 'status', 'error', 'started_at', 'finished_at']);
|
|
168
257
|
});
|
|
258
|
+
const services = net.command('services').description('Postgres or Valkey next to an app, holding data in a volume');
|
|
259
|
+
services.command('list <app>').description('Services this app has').action(async (app) => {
|
|
260
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
261
|
+
const { output } = await import('../../output/format.js');
|
|
262
|
+
const res = await hostingClient().get(`${API}/${await appIdFor(app)}/services`);
|
|
263
|
+
output(res.data, ['name', 'kind', 'title', 'hostname', 'published_port']);
|
|
264
|
+
});
|
|
265
|
+
services.command('add <app> <kind>').description('Add postgres or valkey. It starts with the next deploy.')
|
|
266
|
+
.option('--name <name>', 'What the app calls it (defaults to the kind)')
|
|
267
|
+
.option('--publish', 'Also reachable from outside through the TLS proxy')
|
|
268
|
+
.action(async (app, kind, opts) => {
|
|
269
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
270
|
+
const res = await hostingClient().post(`${API}/${await appIdFor(app)}/services`, { body: { kind, ...(opts.name ? { name: opts.name } : {}), publish: opts.publish === true } });
|
|
271
|
+
console.log(`Added ${res.data.title} as ${res.data.name}. It starts with the next deploy.`);
|
|
272
|
+
console.log(`The app gets ${res.data.env.join(', ')}.`);
|
|
273
|
+
if (res.data.hostname)
|
|
274
|
+
console.log(`From outside: ${res.data.hostname}`);
|
|
275
|
+
});
|
|
276
|
+
services.command('url <app> <name>').description('Connection strings, password included').action(async (app, name) => {
|
|
277
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
278
|
+
const res = await hostingClient().get(`${API}/${await appIdFor(app)}/services/${name}/connection`);
|
|
279
|
+
for (const [k, v] of Object.entries(res.data))
|
|
280
|
+
console.log(`${k}=${v}`);
|
|
281
|
+
});
|
|
282
|
+
const trust = net.command('trust').description('GitHub repositories that may deploy an app from Actions, with no stored key');
|
|
283
|
+
trust.command('list <app>').description('Who may deploy').action(async (app) => {
|
|
284
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
285
|
+
const { output } = await import('../../output/format.js');
|
|
286
|
+
const res = await hostingClient().get(`${API}/${await appIdFor(app)}/publishers`);
|
|
287
|
+
output(res.data, ['id', 'owner', 'repo', 'workflow_file', 'branch_pattern', 'environment']);
|
|
288
|
+
});
|
|
289
|
+
trust.command('add <app> <repository>').description('Let owner/name deploy this app from GitHub Actions')
|
|
290
|
+
.option('--workflow <file>', 'Only this workflow file, like deploy.yml')
|
|
291
|
+
.option('--branch <pattern>', 'Only from branches matching this, like main or release/*')
|
|
292
|
+
.option('--environment <name>', 'Only jobs in this GitHub environment')
|
|
293
|
+
.action(async (app, repository, opts) => {
|
|
294
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
295
|
+
await hostingClient().post(`${API}/${await appIdFor(app)}/publishers`, {
|
|
296
|
+
body: { repository, workflow_file: opts.workflow, branch_pattern: opts.branch, environment: opts.environment },
|
|
297
|
+
});
|
|
298
|
+
console.log(`${repository} can deploy ${app} from GitHub Actions${opts.branch ? ` on ${opts.branch}` : ''}.`);
|
|
299
|
+
});
|
|
300
|
+
trust.command('remove <app> <id>').description('Stop a repository deploying').action(async (app, id) => {
|
|
301
|
+
const { hostingClient } = await import('../../client/hosting.js');
|
|
302
|
+
await hostingClient().delete(`${API}/${await appIdFor(app)}/publishers/${id}`);
|
|
303
|
+
console.log('Removed.');
|
|
304
|
+
});
|
|
169
305
|
net.command('logs <app>').description('Recent logs from one copy')
|
|
170
|
-
.option('--slot <slot>', 'a or
|
|
306
|
+
.option('--slot <slot>', 'a, b, or shared for a service that holds data', 'a')
|
|
307
|
+
.option('--service <name>', 'A stack service other than the public one')
|
|
171
308
|
.option('--lines <n>', 'How many lines', '200')
|
|
172
309
|
.action(async (app, opts) => {
|
|
173
310
|
const { hostingClient } = await import('../../client/hosting.js');
|
|
174
311
|
const res = await hostingClient().get(`${API}/${await appIdFor(app)}/logs`, {
|
|
175
|
-
query: { slot: opts.slot, lines: opts.lines },
|
|
312
|
+
query: { slot: opts.slot, lines: opts.lines, ...(opts.service ? { service: opts.service } : {}) },
|
|
176
313
|
});
|
|
177
314
|
process.stdout.write(res.data);
|
|
178
315
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/servernet/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,OAAO,GAAG,IAAI,CAAC;AACrB,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,MAAM,GAAG,GAAG,6BAA6B,CAAC;AAE1C,2FAA2F;AAC3F,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,IAAI,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IAC7D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,uBAAuB,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IAC5F,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3G,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AACnC,CAAC;AAED,oDAAoD;AACpD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAW,EAAE,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,SAAS,CAAC;AAEpG,qGAAqG;AACrG,KAAK,UAAU,MAAM,CAAC,GAAW,EAAE,KAAa;IAC9C,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,eAAe,EAAE,OAAO,EAAE,EAAE,CAAC;QAC5D,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9G,IAAI,GAAG,CAAC,EAAE;gBAAE,OAAO,IAAI,CAAC;YACxB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,iEAAiE;YACjE,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,OAAO,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;YACnD,OAAO,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YAClC,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG;gBAAE,OAAO,OAAO,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAI,CAAqD,CAAC,KAAK,CAAC;YAC3E,OAAO,GAAG,KAAK,EAAE,IAAI,IAAI,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,kBAAkB,OAAO,YAAY,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,OAAO,GAAG,eAAe;YAAE,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,QAAgB;IACtC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAA2C,GAAG,CAAC,CAAC;IACrF,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAC3E,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,0BAA0B,QAAQ,GAAG,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC,EAAE,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,KAAa,EAAE,YAAoB;IACxD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAClE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,SAAS,CAAC;QACR,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CACxC,GAAG,GAAG,IAAI,KAAK,gBAAgB,YAAY,EAAE,CAC9C,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACnE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAC1B,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAe;IAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,8CAA8C,CAAC,CAAC;IAEpG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;QAC7D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAsB,GAAG,CAAC,CAAC;QAChE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,mCAAmC,CAAC;SAC1E,cAAc,CAAC,iBAAiB,EAAE,4BAA4B,CAAC;SAC/D,MAAM,CAAC,sBAAsB,EAAE,+BAA+B,CAAC;SAC/D,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAAI,EAAE,EAAE;QACnC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAChE,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,IAAI,CAAoC,GAAG,EAAE;YAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE;SAC1E,CAAC,CAAC;QACH,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEL,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,sEAAsE,CAAC,CAAC;IACnH,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QACxF,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAwD,GAAG,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;QACjH,IAAI,CAAC,GAAG,CAAC,IAAI;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,qEAAqE,CAAC;SACxG,cAAc,CAAC,eAAe,EAAE,0BAA0B,CAAC;SAC3D,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAiD,GAAG,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1H,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,iCAAiC,CAAC,CAAC;IAC1G,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,WAAW,CAAC,sCAAsC,CAAC;SACrF,MAAM,CAAC,iBAAiB,EAAE,2DAA2D,CAAC;SACtF,MAAM,CAAC,mBAAmB,EAAE,yDAAyD,CAAC;SACtF,MAAM,CAAC,WAAW,EAAE,yEAAyE,CAAC;SAC9F,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,MAA0B,EAAE,IAAI,EAAE,EAAE;QAC9D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,GAAW,IAAI,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACpC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,YAAY,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC,IAAI,CAAwC,GAAG,GAAG,IAAI,EAAE,WAAW,EAAE;gBACzG,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;aACvH,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC7D,IAAI,SAAS;gBAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/E,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,IAAI,CAA2B,GAAG,GAAG,IAAI,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAClH,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,IAAI;YAAE,MAAM,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,wCAAwC,CAAC;SAChF,MAAM,CAAC,WAAW,EAAE,6BAA6B,CAAC;SAClD,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,IAAI,CAA2B,GAAG,GAAG,IAAI,EAAE,WAAW,CAAC,CAAC;QAC1F,IAAI,IAAI,CAAC,IAAI;YAAE,MAAM,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,8BAA8B,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QACnG,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAoB,GAAG,GAAG,IAAI,MAAM,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QAC1F,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAsB,GAAG,GAAG,IAAI,MAAM,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACxG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,2BAA2B,CAAC;SAC/D,MAAM,CAAC,eAAe,EAAE,QAAQ,EAAE,GAAG,CAAC;SACtC,MAAM,CAAC,aAAa,EAAE,gBAAgB,EAAE,KAAK,CAAC;SAC9C,MAAM,CAAC,KAAK,EAAE,GAAW,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAmB,GAAG,GAAG,IAAI,MAAM,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE;YAC5F,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;SAC9C,CAAC,CAAC;QACH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,EAAE,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;QACnH,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAChG,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,MAAM;IACb,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAC/G,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,YAAY;IACnB,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AACrD,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/servernet/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import fs from 'node:fs';
|
|
|
3
3
|
import os from 'node:os';
|
|
4
4
|
import path from 'node:path';
|
|
5
5
|
import { execFileSync } from 'node:child_process';
|
|
6
|
-
import { finished, packageRelease, parseEnvFile } from './index.js';
|
|
6
|
+
import { finished, packageRelease, parseEnvFile, parseImageRef, resolveImageDigest } from './index.js';
|
|
7
7
|
describe('servernet', () => {
|
|
8
8
|
const dirs = [];
|
|
9
9
|
afterEach(() => { for (const d of dirs.splice(0))
|
|
@@ -38,4 +38,36 @@ describe('servernet', () => {
|
|
|
38
38
|
expect(finished(s)).toBe(true);
|
|
39
39
|
});
|
|
40
40
|
});
|
|
41
|
+
describe('image references', () => {
|
|
42
|
+
const digest = `sha256:${'b'.repeat(64)}`;
|
|
43
|
+
it('reads them the way Docker does', () => {
|
|
44
|
+
expect(parseImageRef('nginx')).toEqual({ registry: 'registry-1.docker.io', repository: 'library/nginx', tag: 'latest' });
|
|
45
|
+
expect(parseImageRef('traefik/whoami:v1.11.0')).toEqual({ registry: 'registry-1.docker.io', repository: 'traefik/whoami', tag: 'v1.11.0' });
|
|
46
|
+
expect(parseImageRef('ghcr.io/o/a:1')).toEqual({ registry: 'ghcr.io', repository: 'o/a', tag: '1' });
|
|
47
|
+
expect(parseImageRef('localhost:5000/a')).toEqual({ registry: 'localhost:5000', repository: 'a', tag: 'latest' });
|
|
48
|
+
});
|
|
49
|
+
it('leaves a digest alone and asks nothing', async () => {
|
|
50
|
+
const ref = `traefik/whoami@${digest}`;
|
|
51
|
+
const never = (() => { throw new Error('no network expected'); });
|
|
52
|
+
await expect(resolveImageDigest(ref, never)).resolves.toBe(ref);
|
|
53
|
+
});
|
|
54
|
+
it('resolves a tag to its digest, following the token challenge', async () => {
|
|
55
|
+
const calls = [];
|
|
56
|
+
const fake = (async (url, init) => {
|
|
57
|
+
calls.push(String(url));
|
|
58
|
+
if (String(url).startsWith('https://auth'))
|
|
59
|
+
return new Response(JSON.stringify({ token: 't' }));
|
|
60
|
+
const authed = (init?.headers).Authorization === 'Bearer t';
|
|
61
|
+
return authed
|
|
62
|
+
? new Response(null, { status: 200, headers: { 'docker-content-digest': digest } })
|
|
63
|
+
: new Response(null, { status: 401, headers: { 'www-authenticate': 'Bearer realm="https://auth.docker.io/token",service="registry.docker.io",scope="repository:traefik/whoami:pull"' } });
|
|
64
|
+
});
|
|
65
|
+
await expect(resolveImageDigest('traefik/whoami:v1.11.0', fake)).resolves.toBe(`traefik/whoami@${digest}`);
|
|
66
|
+
expect(calls).toHaveLength(3);
|
|
67
|
+
});
|
|
68
|
+
it('says so when it can\'t resolve', async () => {
|
|
69
|
+
const fake = (async () => new Response(null, { status: 404 }));
|
|
70
|
+
await expect(resolveImageDigest('traefik/nope:1', fake)).rejects.toThrow(/by digest/);
|
|
71
|
+
});
|
|
72
|
+
});
|
|
41
73
|
//# sourceMappingURL=servernet.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"servernet.test.js","sourceRoot":"","sources":["../../../src/commands/servernet/servernet.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"servernet.test.js","sourceRoot":"","sources":["../../../src/commands/servernet/servernet.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sitepong/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.36",
|
|
4
4
|
"description": "SitePong CLI — manage hosting, builds, OTA, errors, monitoring, and more",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -17,10 +17,11 @@
|
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"commander": "^12.1.0",
|
|
20
|
+
"esbuild": "^0.25.0",
|
|
20
21
|
"open": "^10.1.0",
|
|
21
22
|
"ora": "^8.0.0",
|
|
22
23
|
"picocolors": "^1.1.0",
|
|
23
|
-
"
|
|
24
|
+
"yaml": "^2.9.1"
|
|
24
25
|
},
|
|
25
26
|
"devDependencies": {
|
|
26
27
|
"@types/node": "^20.10.0",
|