@cloud-cli/dx 1.3.1 → 1.4.0

package/README.md

@@ -12,10 +12,9 @@ npm i @cloud-cli/dx
 
 ```bash
 cy dx.list
-cy dx.status
 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.pull --image node:latest
+cy dx.add --name node-app --image node:latest --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.logs --name node-app
 cy dx.stop --name node-app

package/dist/containers.d.ts

@@ -6,12 +6,11 @@ interface GetLogsOptions {
 export declare function getLogs({ name, lines }: GetLogsOptions): Promise<string>;
 interface RunOptions {
     name: string;
-    env?: string[] | string;
-    ports?: string;
 }
+export declare function refreshContainer(options: RunOptions, { run }: any): Promise<void>;
 export declare function startContainer(options: RunOptions, { run }: any): Promise<boolean>;
 export interface StopOptions {
     name: string;
 }
-export declare function stopContainer(options: StopOptions): Promise<boolean>;
+export declare function stopContainer(options: StopOptions, { run }: any): Promise<boolean>;
 export {};

package/dist/containers.js

@@ -22,21 +22,29 @@ export async function getLogs({ name, lines }) {
     }
     return '';
 }
-const defaultRunOptions = { ports: '', env: [] };
+export async function refreshContainer(options, { run }) {
+    const { name } = options;
+    const container = await findContainer(name);
+    await run('dx.stop', { name });
+    await run('dx.pull', { image: container.image });
+    await run('dx.prune');
+    await run('dx.start', { name });
+}
 export async function startContainer(options, { run }) {
-    options = { ...defaultRunOptions, ...options };
     const { name } = options;
     if (!name) {
         throw new Error('Name is required');
     }
     const vars = (await run('env.show', { app: name }));
-    const { env, envKeys } = await getEnvVars(options.env, vars);
+    const { env, envKeys } = await getEnvVars(vars);
     const container = await findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
-    const ports = getPorts([...container.ports.split(','), ...options.ports.split(','), env.PORT + ':' + env.PORT]);
+    const ports = getPorts([...container.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 run('dns.add', { domain: container.host });
+        await run('dns.reload');
     }
     await exec('docker', [
         'run',
@@ -60,30 +68,26 @@ function getPorts(ports) {
     });
     return Object.entries(map).map(([left, right]) => '-p' + left + ':' + right);
 }
-async function getEnvVars(inputEnv, vars) {
+async function getEnvVars(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 }) => {
+    const env = { ...process.env };
+    vars.concat({ key: 'PORT', value: String(port) }).forEach(({ key, value }) => {
         envKeys.push(key);
         env[key] = String(value);
     });
     return { env, envKeys: [...new Set(envKeys)] };
 }
-export async function stopContainer(options) {
-    if (!options.name) {
+export async function stopContainer(options, { run }) {
+    let { name } = options;
+    if (!name) {
         throw new Error('Name is required');
     }
-    await exec('docker', ['stop', '-t', '5', options.name]);
-    await exec('docker', ['rm', options.name]);
+    const container = await findContainer(name);
+    await exec('docker', ['stop', '-t', '5', name]);
+    await exec('docker', ['rm', name]);
+    await run('dns.remove', { domain: container.host });
+    await run('dns.reload');
     return true;
 }
 function getListFromString(string) {

package/dist/images.js

@@ -1,5 +1,8 @@
 import { exec } from '@cloud-cli/exec';
 export async function pull(options) {
+    if (!options.image) {
+        throw new Error('Image is required');
+    }
     return (await exec('docker', ['pull', options.image])).ok;
 }
 export async function prune() {

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,7 +1,7 @@
 import { init } from '@cloud-cli/cli';
 import { Resource, SQLiteDriver } from '@cloud-cli/store';
 import { Container } from './store.js';
-import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
+import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
 import { pull, prune } from './images.js';
 async function reload() {
@@ -15,6 +15,7 @@ export default {
     remove: removeContainer,
     get: getContainer,
     list: listContainers,
+    refresh: refreshContainer,
     update: updateContainer,
     start: startContainer,
     stop: stopContainer,

package/package.json

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