@cloud-cli/dx 2.1.0 → 2.1.1

package/README.md

@@ -14,7 +14,7 @@ npm i @cloud-cli/dx
 cy dx.list
 cy dx.prune
 cy dx.pull --image node:latest
-cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --port '8080' --host 'foo.example.com'
+cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --port '8080' --domain 'foo.example.com'
 cy dx.start --name node-app --env 'FOO=bar'
 cy dx.logs --name node-app
 cy dx.stop --name node-app

package/dist/containers.js

@@ -69,11 +69,11 @@ export async function startContainer(options, { run }) {
     }
     const vars = (await run('env.show', { name }));
     const { env, envKeys } = await getEnvVars(vars);
-    const container = await findContainer(name);
+    const container = findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
     const ports = ['-p' + env.PORT + ':' + (container.port || env.PORT)];
-    if (container.host) {
-        const domain = container.host;
+    if (container.domain) {
+        const [domain] = container.domain.split('/');
         await run('px.update', { domain, target: 'http://localhost:' + env.PORT });
         await run('dns.add', { domain });
     }
@@ -113,9 +113,9 @@ export async function stopContainer(options, { run }) {
     }
     await exec('docker', ['stop', '-t', '5', name]);
     await exec('docker', ['rm', name]);
-    const containers = [await findContainer(name)].filter(Boolean);
+    const containers = [findContainer(name)].filter(Boolean);
     for (const container of containers) {
-        await run('dns.remove', { domain: container.host });
+        await run('dns.remove', { domain: container.domain });
     }
     return true;
 }

package/dist/store.d.ts

@@ -4,7 +4,7 @@ interface ContainerName extends ExtraOptions {
 }
 interface ContainerUpdateOptions extends ContainerName {
     image: string;
-    host?: string;
+    domain?: string;
     volumes?: string;
     port?: string;
 }

package/dist/store.js

@@ -11,8 +11,8 @@ export function addContainer(options) {
         throw new Error('Image required');
     const volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
     const port = options.port || '';
-    const host = options.host;
-    const container = { name, image, volumes, port, host };
+    const domain = options.domain || '';
+    const container = { name, image, volumes, port, domain };
     set(name, container);
     return container;
 }
@@ -31,7 +31,7 @@ export function getContainer(options) {
 const optionSplitter = /,\s*/;
 export function updateContainer(options) {
     readTargetName(options);
-    let { port, volumes, name, image, host } = options;
+    let { port, volumes, name, image, domain } = options;
     const container = get(name);
     if (!container) {
         throw new Error('Container not found');
@@ -45,14 +45,14 @@ export function updateContainer(options) {
     if (image) {
         container.image = image;
     }
-    if (host) {
-        container.host = host;
+    if (domain) {
+        container.domain = domain;
     }
     set(container.name, container);
     return container;
 }
 export function listContainers(options = {}) {
-    const keys = ['name', 'image', 'host', 'port', 'volumes'];
+    const keys = ['name', 'image', 'domain', 'port', 'volumes'];
     const list = getAll();
     const filtered = keys.reduce((list, key) => {
         if (options[key]) {

package/dist/types.d.ts

@@ -5,7 +5,7 @@ export interface Config {
 export interface Container {
     name: string;
     image: string;
-    host: string;
+    domain: string;
     port: string;
     volumes: string;
 }

package/package.json

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