@cloud-cli/dx 1.0.0 → 1.0.1

package/dist/containers.d.ts

@@ -7,8 +7,9 @@ export declare function getLogs({ name, lines }: GetLogsOptions): Promise<string
 interface RunOptions {
     name: string;
     env?: string[];
+    ports?: string;
 }
-export declare function runContainer(options: RunOptions): Promise<boolean>;
+export declare function startContainer(options: RunOptions): Promise<boolean>;
 export interface StopOptions {
     name: string;
 }

package/dist/containers.js

@@ -21,30 +21,34 @@ export async function getLogs({ name, lines }) {
     }
     return '';
 }
-const defaultRunOptions = { env: [] };
-export async function runContainer(options) {
+const defaultRunOptions = { ports: '', env: [] };
+export async function startContainer(options) {
     options = { ...defaultRunOptions, ...options };
     const { name } = options;
     if (!name) {
         throw new Error('Name is required');
     }
+    const env = [];
+    if (Array.isArray(options.env)) {
+        env.push(...options.env.flatMap((e) => ['-e', e]));
+    }
     const container = await findContainer(name);
-    const env = options.env.flatMap((e) => ['-e', e]);
-    const volumes = container.volumes
-        .split(',')
-        .filter(Boolean)
-        .map((v) => `-v${v}`);
-    const ports = container.ports
-        .split(',')
-        .filter(Boolean)
-        .map((p) => `-p${p}`);
-    await exec('docker', ['run', '--rm', '--detach', '--name', name, ...volumes, ...ports, ...env, container.image]);
+    const volumes = addExecFlag(container.volumes, 'v');
+    const ports = addExecFlag(container.ports, 'p');
+    const extraPorts = addExecFlag(options.ports, 'p');
+    await exec('docker', ['run', '--rm', '--detach', '--name', name, ...volumes, ...ports, ...extraPorts, ...env, container.image]);
     return true;
 }
 export async function stopContainer(options) {
     await exec('docker', ['stop', '-t', '5', options.name]);
+    await exec('docker', ['rm', options.name]);
     return true;
 }
 function getListFromString(string) {
     return string.trim().split('\n').filter(Boolean);
 }
+function addExecFlag(string, flag) {
+    return string.split(',')
+        .filter(Boolean)
+        .map((p) => `-${flag}${p}`);
+}

package/dist/images.js

@@ -2,10 +2,3 @@ import { exec } from '@cloud-cli/exec';
 export async function pull(options) {
     return (await exec('docker', ['pull', options.image])).ok;
 }
-/*
-async getImages(): Promise<string[]> {
-  const list = await this.shellExec('docker', ['image', 'ls', '--format', '{{.Repository}}']);
-
-  return list.filter((s: string) => s !== '<none>');
-}
-*/ 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { init } from '@cloud-cli/cli';
-import { getRunningContainers, getLogs, runContainer, stopContainer } from './containers.js';
+import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer } from './store.js';
 import { pull } from './images.js';
 declare function reload(): Promise<void>;
@@ -9,7 +9,7 @@ declare const _default: {
     remove: typeof removeContainer;
     list: typeof listContainers;
     update: typeof updateContainer;
-    run: typeof runContainer;
+    start: typeof startContainer;
     stop: typeof stopContainer;
     ps: typeof getRunningContainers;
     logs: typeof getLogs;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { init } from '@cloud-cli/cli';
 import { Resource } from '@cloud-cli/store';
 import { Container } from './store.js';
-import { getRunningContainers, getLogs, runContainer, stopContainer } from './containers.js';
+import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer } from './store.js';
 import { pull } from './images.js';
 async function reload() {
@@ -13,7 +13,7 @@ export default {
     remove: removeContainer,
     list: listContainers,
     update: updateContainer,
-    run: runContainer,
+    start: startContainer,
     stop: stopContainer,
     ps: getRunningContainers,
     logs: getLogs,

package/dist/store.d.ts

@@ -19,6 +19,7 @@ export declare function removeContainer(options: ContainerName): Promise<boolean
 interface UpdateOptions extends ContainerName {
     ports?: string;
     volumes?: string;
+    image?: string;
 }
 export declare function updateContainer(options: UpdateOptions): Promise<Container>;
 export declare function listContainers(): Promise<Container[]>;

package/dist/store.js

@@ -34,6 +34,10 @@ Container = __decorate([
 export { Container };
 export async function addContainer(options) {
     const { name, image } = options;
+    if (!name)
+        throw new Error('Name required');
+    if (!image)
+        throw new Error('Image required');
     const volumes = (options.volumes ? sanitiseVolumes(options.volumes) : '');
     const ports = (options.ports ? sanitisePorts(options.ports) : '');
     const container = new Container({ name, image, volumes, ports });
@@ -51,14 +55,20 @@ export async function removeContainer(options) {
 }
 const optionSplitter = /,\s*/;
 export async function updateContainer(options) {
-    let { ports, volumes, name } = options;
+    let { ports, volumes, name, image } = options;
     const container = await findContainer(name);
+    if (!container) {
+        throw new Error('Container not found');
+    }
     if (ports) {
         container.ports = sanitisePorts(ports);
     }
     if (volumes) {
         container.volumes = sanitiseVolumes(volumes);
     }
+    if (image) {
+        container.image = image;
+    }
     await container.save();
     return container;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",