@cloud-cli/dx 1.2.1 → 1.3.0

package/README.md

@@ -13,9 +13,10 @@ npm i @cloud-cli/dx
 ```bash
 cy dx.list
 cy dx.status
-cy dx.add --name node-app --image node --version latest --command 'node --version' --volumes 'volume:/container/path' --ports '1234:80'
+cy dx.prune
+cy dx.pull node:latest
+cy dx.add --name node-app --image node --version latest --command 'node --version' --volumes 'volume:/container/path' --ports '1234:80' --host 'foo.example.com'
 cy dx.start --name node-app --env 'FOO=bar' --ports '1234:80'
-cy dx.status --name node-app
 cy dx.logs --name node-app
 cy dx.stop --name node-app
 cy dx.remove --name node-app

package/dist/containers.d.ts

@@ -9,7 +9,7 @@ interface RunOptions {
     env?: string[] | string;
     ports?: string;
 }
-export declare function startContainer(options: RunOptions): Promise<boolean>;
+export declare function startContainer(options: RunOptions, { run }: any): Promise<boolean>;
 export interface StopOptions {
     name: string;
 }

package/dist/containers.js

@@ -1,5 +1,6 @@
 import { exec } from '@cloud-cli/exec';
 import { findContainer } from './store.js';
+import getPort from 'get-port';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
     if (!ps.ok) {
@@ -22,23 +23,21 @@ export async function getLogs({ name, lines }) {
     return '';
 }
 const defaultRunOptions = { ports: '', env: [] };
-export async function startContainer(options) {
+export async function startContainer(options, { run }) {
     options = { ...defaultRunOptions, ...options };
     const { name } = options;
     if (!name) {
         throw new Error('Name is required');
     }
-    const env = [];
-    if (typeof options.env === 'string') {
-        options.env = [options.env];
-    }
-    if (Array.isArray(options.env)) {
-        env.push(...options.env.flatMap((e) => ['-e', e]));
-    }
+    const vars = (await run('env.show', { app: name }));
+    const { env, envKeys } = await getEnvVars(options.env, vars);
     const container = await findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
-    const ports = addExecFlag(container.ports, 'p');
-    const extraPorts = addExecFlag(options.ports, 'p');
+    const ports = getPorts([...container.ports.split(','), ...options.ports.split(','), env.PORT + ':' + env.PORT]);
+    if (container.host) {
+        await run('px.remove', { domain: container.host });
+        await run('px.add', { domain: container.host, target: 'http://localhost:' + env.PORT, cors: true, redirect: true });
+    }
     await exec('docker', [
         'run',
         '--detach',
@@ -48,12 +47,37 @@ export async function startContainer(options) {
         name,
         ...volumes,
         ...ports,
-        ...extraPorts,
-        ...env,
+        ...envKeys.map((e) => '-e' + e),
         container.image,
-    ]);
+    ], { env });
     return true;
 }
+function getPorts(ports) {
+    const map = {};
+    ports.forEach((str) => {
+        const [left, right] = str.split(':');
+        map[left] = right;
+    });
+    return Object.entries(map).map(([left, right]) => '-p' + left + ':' + right);
+}
+async function getEnvVars(inputEnv, vars) {
+    const port = await getPort();
+    const envVars = vars.concat({ key: 'PORT', value: String(port) });
+    const additionalEnv = [inputEnv].flat();
+    if (Array.isArray(additionalEnv)) {
+        additionalEnv.forEach((str) => {
+            let [key, value] = str.split('=');
+            envVars.push({ key, value });
+        });
+    }
+    const envKeys = [];
+    const env = {};
+    envVars.forEach(({ key, value }) => {
+        envKeys.push(key);
+        env[key] = String(value);
+    });
+    return { env, envKeys: [...new Set(envKeys)] };
+}
 export async function stopContainer(options) {
     if (!options.name) {
         throw new Error('Name is required');

package/dist/images.d.ts

@@ -1,3 +1,4 @@
 export declare function pull(options: {
     image: string;
 }): Promise<boolean>;
+export declare function prune(): Promise<boolean>;

package/dist/images.js

@@ -2,3 +2,6 @@ import { exec } from '@cloud-cli/exec';
 export async function pull(options) {
     return (await exec('docker', ['pull', options.image])).ok;
 }
+export async function prune() {
+    return (await exec('docker', ['image', 'prune', '-f'])).ok;
+}

package/dist/index.d.ts

@@ -1,10 +1,11 @@
 import { init } from '@cloud-cli/cli';
 import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
-import { pull } from './images.js';
+import { pull, prune } from './images.js';
 declare function reload(): Promise<void>;
 declare const _default: {
     pull: typeof pull;
+    prune: typeof prune;
     add: typeof addContainer;
     remove: typeof removeContainer;
     get: typeof getContainer;

package/dist/index.js

@@ -3,13 +3,14 @@ import { Resource, SQLiteDriver } from '@cloud-cli/store';
 import { Container } from './store.js';
 import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
-import { pull } from './images.js';
+import { pull, prune } from './images.js';
 async function reload() {
     Resource.use(new SQLiteDriver());
     await Resource.create(Container);
 }
 export default {
     pull,
+    prune,
     add: addContainer,
     remove: removeContainer,
     get: getContainer,

package/dist/store.d.ts

@@ -3,6 +3,7 @@ export declare class Container extends Resource {
     id: number;
     name: string;
     image: string;
+    host: string;
     ports: string;
     volumes: string;
 }
@@ -11,6 +12,7 @@ interface ContainerName {
 }
 interface AddContainerOptions extends ContainerName {
     image: string;
+    host?: string;
     volumes?: string;
     ports?: string;
 }
@@ -21,6 +23,7 @@ interface UpdateOptions extends ContainerName {
     ports?: string;
     volumes?: string;
     image?: string;
+    host?: string;
 }
 export declare function updateContainer(options: UpdateOptions): Promise<Container>;
 export declare function listContainers(): Promise<Container[]>;

package/dist/store.js

@@ -20,6 +20,10 @@ __decorate([
     NotNull(),
     Property(String)
 ], Container.prototype, "image", void 0);
+__decorate([
+    NotNull(),
+    Property(String)
+], Container.prototype, "host", void 0);
 __decorate([
     NotNull(),
     Property(String)
@@ -40,7 +44,8 @@ export async function addContainer(options) {
         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 });
+    const host = options.host;
+    const container = new Container({ name, image, volumes, ports, host });
     const id = await container.save();
     container.id = id;
     return container;
@@ -58,7 +63,7 @@ export async function getContainer(options) {
 }
 const optionSplitter = /,\s*/;
 export async function updateContainer(options) {
-    let { ports, volumes, name, image } = options;
+    let { ports, volumes, name, image, host } = options;
     const container = await findContainer(name);
     if (!container) {
         throw new Error('Container not found');
@@ -72,6 +77,9 @@ export async function updateContainer(options) {
     if (image) {
         container.image = image;
     }
+    if (host) {
+        container.host = host;
+    }
     await container.save();
     return container;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,6 +32,7 @@
   "dependencies": {
     "@cloud-cli/cli": "^1.4.4",
     "@cloud-cli/exec": "^1.0.4",
-    "@cloud-cli/store": "^1.5.1"
+    "@cloud-cli/store": "^1.5.1",
+    "get-port": "^6.1.2"
   }
 }