@cloud-cli/dx 2.1.2 → 2.1.4

package/dist/containers.js

@@ -1,7 +1,8 @@
 import { exec } from '@cloud-cli/exec';
-import { getConfig } from '@cloud-cli/cli';
+import { getConfig, logInfo, logError } from '@cloud-cli/cli';
 import { findContainer, listContainers } from './store.js';
 import { addExecFlag, getEnvVars, getListFromString, readTargetName } from './utils.js';
+import getPort from 'get-port';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
     if (!ps.ok) {
@@ -67,11 +68,16 @@ export async function startContainer(options, { run }) {
     if (!name) {
         throw new Error('Name is required');
     }
+    const container = findContainer(name);
+    if (!container) {
+        throw new Error('Container not found: ' + name);
+    }
     const vars = (await run('env.show', { name }));
+    const port = String(container.port || (await getPort()));
+    vars.push({ key: 'PORT', value: port });
     const { env, envKeys } = await getEnvVars(vars);
-    const container = findContainer(name);
-    const volumes = addExecFlag(container.volumes, 'v');
-    const ports = ['-p' + env.PORT + ':' + (container.port || env.PORT)];
+    const volumes = addExecFlag(container.volumes.split(','), 'v');
+    const ports = addExecFlag([`${port}:${port}`], 'p');
     if (container.domain) {
         const [domain] = container.domain.split('/');
         await run('px.update', { domain, target: 'http://localhost:' + env.PORT });
@@ -95,14 +101,17 @@ export async function startContainer(options, { run }) {
         ...extraArgs,
         ...volumes,
         ...ports,
-        ...envKeys.map((e) => '-e' + e),
+        ...addExecFlag(envKeys, 'e'),
         container.image,
     ];
     const output = await exec('docker', execArgs.filter(Boolean), { env });
     if (!output.ok) {
+        const e = 'Failed to start container ' + name;
         console.log([output.stdout, output.stderr].join('\n\n'));
-        throw new Error('Failed to start ' + name);
+        logError(e);
+        throw new Error(e);
     }
+    logInfo('Started container ' + name);
     return true;
 }
 export async function stopContainer(options, { run }) {
@@ -113,9 +122,10 @@ export async function stopContainer(options, { run }) {
     }
     await exec('docker', ['stop', '-t', '5', name]);
     await exec('docker', ['rm', name]);
-    const containers = [findContainer(name)].filter(Boolean);
+    const containers = [findContainer(name)].filter(c => c && c.domain);
     for (const container of containers) {
         await run('dns.remove', { domain: container.domain });
     }
+    logInfo('Stopped container ' + name);
     return true;
 }

package/dist/utils.d.ts

@@ -10,6 +10,6 @@ export declare function getEnvVars(vars: EnvList): Promise<{
     envKeys: string[];
 }>;
 export declare function getListFromString(string: string): string[];
-export declare function addExecFlag(string: string, flag: string): string[];
+export declare function addExecFlag(list: string[], flag: string): string[];
 export declare function readTargetName(args: any): void;
 export declare function readTargetImage(args: any): void;

package/dist/utils.js

@@ -1,9 +1,7 @@
-import getPort from 'get-port';
 export async function getEnvVars(vars) {
-    const port = await getPort();
     const envKeys = [];
     const env = { ...process.env };
-    vars.concat({ key: 'PORT', value: String(port) }).forEach(({ key, value }) => {
+    vars.forEach(({ key, value }) => {
         envKeys.push(key);
         env[key] = String(value);
     });
@@ -12,9 +10,8 @@ export async function getEnvVars(vars) {
 export function getListFromString(string) {
     return String(string).trim().split('\n').filter(Boolean);
 }
-export function addExecFlag(string, flag) {
-    return string
-        .split(',')
+export function addExecFlag(list, flag) {
+    return list
         .filter(Boolean)
         .map((p) => `-${flag}${p}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,6 +19,7 @@
     "@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",
     "typescript": "^5.4.5",
     "vitest": "^1.6.0"
   },