@cloud-cli/dx 2.3.0 → 2.5.0

package/README.md

@@ -19,6 +19,7 @@ cy dx.start --name node-app
 cy dx.logs --name node-app
 cy dx.stop --name node-app
 cy dx.remove --name node-app
+cy dx.updateAll --image node:latest
 ```
 
 ## Options

package/dist/containers.d.ts

@@ -5,7 +5,15 @@ export declare function getAllContainers(): Promise<NameAndStatus[]>;
 export declare function getLogs(options: GetLogsOptions): Promise<string>;
 export declare function renameContainer(options: RenameOptions): Container;
 export declare function startAll(_: any, cli: any): Promise<boolean>;
+export declare function updateAll(options: {
+    image: string;
+}, cli: any): Promise<any[]>;
 export declare function refreshContainer(options: ContainerName, { run }: ServerParams): Promise<void>;
 export declare function restartContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
-export declare function startContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
+export interface StartOptions {
+    worker?: boolean;
+    startArgs?: string;
+}
+export declare function runContainer(options: ContainerName & StartOptions, p: ServerParams): Promise<boolean>;
+export declare function startContainer(options: ContainerName & StartOptions, { run }: ServerParams): Promise<boolean>;
 export declare function stopContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;

package/dist/containers.js

@@ -56,6 +56,20 @@ export async function startAll(_, cli) {
     }
     return true;
 }
+export async function updateAll(options, cli) {
+    const list = listContainers();
+    const affected = [];
+    for (const app of list) {
+        if (app.image !== options.image)
+            continue;
+        try {
+            await refreshContainer({ name: app.name }, cli);
+            affected.push(app.name);
+        }
+        catch { }
+    }
+    return affected;
+}
 export async function refreshContainer(options, { run }) {
     readTargetName(options);
     if (!options.name) {
@@ -87,6 +101,9 @@ async function getPorts(container) {
     const port = Number(container.port);
     return [port, port];
 }
+export function runContainer(options, p) {
+    return startContainer({ ...options, worker: true }, p);
+}
 export async function startContainer(options, { run }) {
     readTargetName(options);
     const { name } = options;
@@ -105,10 +122,10 @@ export async function startContainer(options, { run }) {
     const portBindings = addExecFlag([ports.join(':')], 'p');
     const extraArgs = [];
     const config = await getConfig('dx');
-    if (container.domain) {
-        const [domain, path = ''] = container.domain.split("/");
-        await run("dns.add", { domain });
-        extraArgs.push("--label", "px:host=" + domain, "--label", "px:path=" + path);
+    if (container.domain && !options.worker) {
+        const [domain, path = ''] = container.domain.split('/');
+        await run('dns.add', { domain });
+        extraArgs.push('--label', 'px:host=' + domain, '--label', 'px:path=' + path);
     }
     if (config.dns) {
         extraArgs.push('--dns=' + config.dns);
@@ -119,8 +136,7 @@ export async function startContainer(options, { run }) {
     const execArgs = [
         'run',
         '--detach',
-        '--restart',
-        'always',
+        ...(!options.worker ? ['--restart', 'always'] : []),
         '--name',
         name,
         ...extraArgs,
@@ -129,6 +145,10 @@ export async function startContainer(options, { run }) {
         ...addExecFlag(envKeys, 'e'),
         container.image,
     ];
+    if (options.startArgs) {
+        const p = options.startArgs;
+        execArgs.push(...(Array.isArray(p) ? p : JSON.parse(p)));
+    }
     const output = await exec('docker', execArgs.filter(Boolean), { env });
     if (!output.ok) {
         const e = 'Failed to start container ' + name;
@@ -150,7 +170,7 @@ export async function stopContainer(options, { run }) {
     }
     await exec('docker', ['stop', '-t', '5', name]);
     await exec('docker', ['rm', name]);
-    const containers = [findContainer(name)].filter(c => c && c.domain);
+    const containers = [findContainer(name)].filter((c) => c && c.domain);
     for (const container of containers) {
         await run('dns.remove', { domain: container.domain });
     }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { getLogs, refreshContainer, restartContainer, startAll, startContainer, stopContainer, renameContainer } from "./containers.js";
+import { getLogs, refreshContainer, restartContainer, startAll, startContainer, stopContainer, renameContainer, runContainer } from "./containers.js";
 import { prune, pull } from "./images.js";
 import { addContainer, getContainer, listContainers, removeContainer, updateContainer } from "./store.js";
 export type { Config } from "./types.js";
@@ -17,6 +17,7 @@ declare const _default: {
     update: typeof updateContainer;
     startAll: typeof startAll;
     start: typeof startContainer;
+    run: typeof runContainer;
     stop: typeof stopContainer;
     restart: typeof restartContainer;
     ps: typeof ps;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { getAllContainers, getLogs, getRunningContainers, refreshContainer, restartContainer, startAll, startContainer, stopContainer, renameContainer, } from "./containers.js";
+import { getAllContainers, getLogs, getRunningContainers, refreshContainer, restartContainer, startAll, startContainer, stopContainer, renameContainer, runContainer, } from "./containers.js";
 import { prune, pull } from "./images.js";
 import { addContainer, getContainer, listContainers, removeContainer, updateContainer, } from "./store.js";
 function ps(options = {}) {
@@ -19,6 +19,7 @@ export default {
     update: updateContainer,
     startAll,
     start: startContainer,
+    run: runContainer,
     stop: stopContainer,
     restart: restartContainer,
     ps: ps,

package/dist/store.d.ts

@@ -7,6 +7,8 @@ interface ContainerUpdateOptions extends ContainerName {
     domain?: string;
     volumes?: string;
     port?: string;
+    worker?: boolean;
+    startArgs?: string;
 }
 type ContainerListOptions = Partial<Container>;
 export declare function addContainer(options: ContainerUpdateOptions): Container;

package/dist/store.js

@@ -10,9 +10,8 @@ export function addContainer(options) {
     if (!image)
         throw new Error('Image required');
     const volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
-    const port = options.port || '';
-    const domain = options.domain || '';
-    const container = { name, image, volumes, port, domain };
+    const { port = '', domain = '', worker = false, startArgs = '' } = options;
+    const container = { name, image, volumes, port, domain, worker, startArgs };
     set(name, container);
     return container;
 }
@@ -31,23 +30,29 @@ export function getContainer(options) {
 const optionSplitter = /,\s*/;
 export function updateContainer(options) {
     readTargetName(options);
-    let { port, volumes, name, image, domain } = options;
+    let { port, volumes, name, image, domain, startArgs, worker } = options;
     const container = get(name);
     if (!container) {
         throw new Error('Container not found');
     }
-    if (port) {
+    if (port !== undefined) {
         container.port = port;
     }
-    if (volumes) {
+    if (volumes !== undefined) {
         container.volumes = sanitiseVolumes(volumes);
     }
-    if (image) {
+    if (image !== undefined) {
         container.image = image;
     }
-    if (domain) {
+    if (domain !== undefined) {
         container.domain = domain;
     }
+    if (startArgs !== undefined) {
+        container.startArgs = startArgs;
+    }
+    if (worker !== undefined) {
+        container.worker = worker;
+    }
     set(container.name, container);
     return container;
 }
@@ -63,7 +68,7 @@ export function listContainers(options = {}) {
     const list = getAll();
     const filtered = keys.reduce((list, key) => {
         if (options[key]) {
-            return list.filter((c) => String(c[key]).toLowerCase().includes(options[key].toLowerCase()));
+            return list.filter((c) => String(c[key]).toLowerCase().includes(String(options[key]).toLowerCase()));
         }
         return list;
     }, list);

package/dist/types.d.ts

@@ -8,6 +8,8 @@ export interface Container {
     domain: string;
     port: string;
     volumes: string;
+    worker: boolean;
+    startArgs: string;
 }
 export interface NameAndStatus {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,9 +19,9 @@
     "@cloud-cli/prettier-config": "^1.0.0",
     "@cloud-cli/typescript-config": "^1.0.1",
     "@types/node": "^20.12.8",
-    "@vitest/coverage-v8": "^1.6.0",
+    "@vitest/coverage-v8": "^3.1.1",
     "typescript": "^5.4.5",
-    "vitest": "^1.6.0"
+    "vitest": "^3.1.1"
   },
   "repository": {
     "type": "git",