@cloud-cli/dx 1.5.1 → 1.7.0

package/dist/config.d.ts

@@ -0,0 +1,5 @@
+export interface Config {
+    dns?: string;
+}
+export declare function setConfig(newConfig: Config): void;
+export declare function getConfig(name: keyof Config): string;

package/dist/config.js

@@ -0,0 +1,7 @@
+const config = {};
+export function setConfig(newConfig) {
+    Object.assign(config, newConfig);
+}
+export function getConfig(name) {
+    return config[name];
+}

package/dist/containers.js

@@ -1,5 +1,6 @@
 import { exec } from '@cloud-cli/exec';
 import { findContainer, listContainers } from './store.js';
+import { getConfig } from './config.js';
 import { addExecFlag, getEnvVars, getListFromString, getPorts } from './utils.js';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
@@ -23,7 +24,7 @@ export async function getLogs({ name, lines }) {
     return '';
 }
 export async function startAll(_, cli) {
-    const list = await listContainers();
+    const list = await listContainers({});
     const running = await getRunningContainers();
     const notRunning = list.filter(({ name }) => !running.includes(name));
     for (const app of notRunning) {
@@ -35,6 +36,9 @@ export async function startAll(_, cli) {
     return true;
 }
 export async function refreshContainer(options, { run }) {
+    if (!options.name) {
+        throw new Error('Name is required');
+    }
     const { name } = options;
     const container = await findContainer(name);
     await run('dx.pull', { image: container.image });
@@ -47,17 +51,21 @@ export async function startContainer(options, { run }) {
     if (!name) {
         throw new Error('Name is required');
     }
-    const vars = (await run('env.show', { app: name }));
+    const vars = (await run('env.show', { name }));
     const { env, envKeys } = await getEnvVars(vars);
     const container = await findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
     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 });
+        const domain = container.host;
+        await run('px.update', { domain, target: 'http://localhost:' + env.PORT });
+        await run('dns.add', { domain });
         await run('dns.reload', {});
     }
+    const dnsOption = [];
+    if (getConfig('dns')) {
+        dnsOption.push('--dns=' + getConfig('dns'));
+    }
     const execArgs = [
         'run',
         '--detach',
@@ -65,12 +73,13 @@ export async function startContainer(options, { run }) {
         'always',
         '--name',
         name,
+        ...dnsOption,
         ...volumes,
         ...ports,
         ...envKeys.map((e) => '-e' + e),
         container.image,
     ];
-    const output = await exec('docker', execArgs, { env });
+    const output = await exec('docker', execArgs.filter(Boolean), { env });
     if (!output.ok) {
         throw new Error('Failed to start ' + name);
     }

package/dist/index.d.ts

@@ -2,6 +2,8 @@ import { init } from '@cloud-cli/cli';
 import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer, startAll } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
 import { pull, prune } from './images.js';
+import { Config } from './config';
+export { Config } from './config';
 declare const _default: {
     pull: typeof pull;
     prune: typeof prune;
@@ -16,6 +18,6 @@ declare const _default: {
     stop: typeof stopContainer;
     ps: typeof getRunningContainers;
     logs: typeof getLogs;
-    [init](): Promise<void>;
+    [init](config?: Config): Promise<void>;
 };
 export default _default;

package/dist/index.js

@@ -4,6 +4,7 @@ import { Container } from './store.js';
 import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer, startAll } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
 import { pull, prune } from './images.js';
+import { setConfig } from './config';
 async function initResource() {
     Resource.use(new SQLiteDriver());
     await Resource.create(Container);
@@ -22,7 +23,8 @@ export default {
     stop: stopContainer,
     ps: getRunningContainers,
     logs: getLogs,
-    async [init]() {
+    async [init](config) {
+        setConfig(config);
         await initResource();
     }
 };

package/dist/store.d.ts

@@ -26,6 +26,11 @@ interface UpdateOptions extends ContainerName {
     host?: string;
 }
 export declare function updateContainer(options: UpdateOptions): Promise<Container>;
-export declare function listContainers(): Promise<Container[]>;
+interface ListOptions {
+    name?: string;
+    image?: string;
+    host?: string;
+}
+export declare function listContainers(options: ListOptions): Promise<Container[]>;
 export declare function findContainer(name: string): Promise<Container | null>;
 export {};

package/dist/store.js

@@ -42,8 +42,8 @@ export async function addContainer(options) {
         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 volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
+    const ports = options.ports ? sanitisePorts(options.ports) : '';
     const host = options.host;
     const container = new Container({ name, image, volumes, ports, host });
     const id = await container.save();
@@ -83,8 +83,10 @@ export async function updateContainer(options) {
     await container.save();
     return container;
 }
-export async function listContainers() {
-    const list = await Resource.find(Container, new Query());
+export async function listContainers(options) {
+    const query = new Query();
+    ['name', 'image', 'host'].forEach((key) => !options[key] || query.where(key).is(options[key]));
+    const list = await Resource.find(Container, query);
     return list.sort((a, b) => Number(a.name > b.name) || -1);
 }
 export async function findContainer(name) {
@@ -93,9 +95,17 @@ export async function findContainer(name) {
 }
 const portTester = /^\d+:\d+$/;
 function sanitisePorts(ports) {
-    return ports.split(optionSplitter).map(s => s.trim()).filter(s => portTester.test(s)).join(',');
+    return ports
+        .split(optionSplitter)
+        .map((s) => s.trim())
+        .filter((s) => portTester.test(s))
+        .join(',');
 }
 const volumeTester = /^\S+:\S+$/;
 function sanitiseVolumes(volumes) {
-    return volumes.split(optionSplitter).map(s => s.trim()).filter(s => volumeTester.test(s)).join(',');
+    return volumes
+        .split(optionSplitter)
+        .map((s) => s.trim())
+        .filter((s) => volumeTester.test(s))
+        .join(',');
 }

package/package.json

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