WIP: 5739-useDocker_inSalix #5
|
@ -124,14 +124,14 @@ class Run extends Command {
|
|||
|
||||
try {
|
||||
const server = new Server(ct, dbConfig);
|
||||
|
||||
if (isRandom) {
|
||||
const useCustom = opts.ci || opts.network
|
||||
if (isRandom || useCustom) {
|
||||
try {
|
||||
const netSettings = await ct.inspect({
|
||||
format: '{{json .NetworkSettings}}'
|
||||
});
|
||||
|
||||
if (opts.ci || opts.network) {
|
||||
if (useCustom) {
|
||||
dbConfig.host = opts.network
|
||||
? netSettings.Networks[opts.network].IPAddress
|
||||
: netSettings.Gateway;
|
||||
|
|
3
myt.js
3
myt.js
|
@ -181,7 +181,7 @@ class Myt {
|
|||
const defaultConfig = require(`${__dirname}/assets/myt.default.yml`);
|
||||
const config = Object.assign({}, defaultConfig);
|
||||
|
||||
const configFile = 'myt.config.yml';
|
||||
const configFile = opts.configFile ?? 'myt.config.yml';
|
||||
const configPath = path.join(opts.workspace, configFile);
|
||||
|
||||
if (await fs.pathExists(configPath)) {
|
||||
|
@ -407,7 +407,6 @@ class Myt {
|
|||
|
||||
async openRepo() {
|
||||
const {opts} = this;
|
||||
|
||||
if (!await fs.pathExists(`${opts.workspace}/.git`))
|
||||
throw new Error ('Git not initialized');
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue