@cloud-cli/dx 1.6.0 → 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}}']);
@@ -57,12 +58,14 @@ export async function startContainer(options, { run }) {
     const ports = getPorts([...container.ports.split(','), env.PORT + ':' + env.PORT]);
     if (container.host) {
         const domain = container.host;
-        const proxy = await run('px.get', { domain });
-        await run('px.remove', { domain });
-        await run('px.add', { ...proxy, domain, target: 'http://localhost:' + env.PORT });
+        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',
@@ -70,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/package.json

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