@cloud-cli/dx 2.1.3 → 2.2.0

package/README.md

@@ -14,9 +14,19 @@ 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' --domain 'foo.example.com'
-cy dx.start --name node-app --env 'FOO=bar'
+cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --port ':80' --domain 'foo.example.com'
+cy dx.start --name node-app
 cy dx.logs --name node-app
 cy dx.stop --name node-app
 cy dx.remove --name node-app
 ```
+
+## Options
+
+| Option | Description |
+|-|-|
+| name | Required. Container name |
+| image | Required: Container image |
+| volumes | Comma-separated list of volume bindings |
+| port | Empty = random port. `:port` = random host port. `number` = fixed port on host and container |
+| domain | Domain to bind this container to. Requires `@cloud-cli/px` and `@cloud-cli/dns` |

package/dist/containers.js

@@ -1,5 +1,5 @@
 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';
@@ -62,6 +62,18 @@ export async function restartContainer(options, { run }) {
     await run('dx.start', { name });
     return true;
 }
+async function getPorts(container) {
+    if (!container.port) {
+        const port = await getPort();
+        return [port, port];
+    }
+    if (container.port.startsWith(':')) {
+        const port = await getPort();
+        return [port, Number(container.port.slice(1))];
+    }
+    const port = Number(container.port);
+    return [port, port];
+}
 export async function startContainer(options, { run }) {
     readTargetName(options);
     const { name } = options;
@@ -73,11 +85,11 @@ export async function startContainer(options, { run }) {
         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 ports = await getPorts(container);
+    vars.push({ key: 'PORT', value: String(ports[1]) });
     const { env, envKeys } = await getEnvVars(vars);
     const volumes = addExecFlag(container.volumes.split(','), 'v');
-    const ports = addExecFlag([`${port}:${port}`], 'p');
+    const portBindings = addExecFlag([ports.join(':')], 'p');
     if (container.domain) {
         const [domain] = container.domain.split('/');
         await run('px.update', { domain, target: 'http://localhost:' + env.PORT });
@@ -100,15 +112,18 @@ export async function startContainer(options, { run }) {
         name,
         ...extraArgs,
         ...volumes,
-        ...ports,
+        ...portBindings,
         ...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 }) {
@@ -119,9 +134,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -35,6 +35,9 @@
     "get-port": "^7.1.0"
   },
   "peerDependencies": {
-    "@cloud-cli/cli": "^2.0.0"
+    "@cloud-cli/cli": "^2.0.0",
+    "@cloud-cli/env": "^1.0.0",
+    "@cloud-cli/dns": "^2.0.0",
+    "@cloud-cli/px": "^4.0.0"
   }
 }