@rpcbase/server 0.64.0 → 0.67.0

package/cli/get_runtime.js

@@ -1,7 +1,13 @@
 /* @flow */
 const os = require("os")
 
+const {FORCE_DOCKER} = process.env
+
 const get_runtime = () => {
+  if (FORCE_DOCKER) {
+    return "docker"
+  }
+
   if (os.platform() === "darwin") {
     return "native"
   } else {

package/cli/run_docker.js

@@ -1,6 +1,7 @@
 /* @flow */
 const {spawn} = require("child_process")
 const path = require("path")
+const fs = require("fs")
 
 const chalk = require("chalk")
 
@@ -10,15 +11,26 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
   // env
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
 
+  const exists = (f) => {
+    const target_path = path.join(infrastructure_dir, f)
+    return fs.existsSync(target_path)
+  }
+
   // compose files
   const compose_files = ["-f", "common.yml"]
-  if (!is_native) {
+  // TODO: which files are loaded and when should be documented
+  if (!is_native && exists("native.yml")) {
     compose_files.push("-f", "native.yml")
   }
-  if (is_production) {
+  if (!is_native && !is_production && exists("native.dev.yml")) {
+    compose_files.push("-f", "native.dev.yml")
+  }
+  if (is_production && exists("prod.yml")) {
     compose_files.push("-f", "prod.yml")
   }
-  else compose_files.push("-f", "dev.yml")
+  if (!is_production && exists("dev.yml")) {
+    compose_files.push("-f", "dev.yml")
+  }
 
   const opts = ["--build", "--remove-orphans"]
   if (!is_production) opts.push("--abort-on-container-exit")
@@ -29,6 +41,9 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
 
   console.log(cmd_args.join(" "))
 
+  // trim extra docker spaces
+  const fmt_line = (line) => line.replace("       |", "")
+
   const ps = spawn(cmd, cmd_args, {cwd: infrastructure_dir})
   ps.stdout.on("data", (data) => {
     const lines = data.toString().split("\n")
@@ -36,7 +51,7 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
       if (line.trim() === "") {
         return
       }
-      process.stdout.write(`${chalk.cyan("docker")}: ${line}\n`)
+      process.stdout.write(`${chalk.cyan("docker")}: ${fmt_line(line)}\n`)
     })
   })
 
@@ -46,7 +61,7 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
       if (line.trim() === "") {
         return
       }
-      process.stdout.write(`${chalk.cyan("docker")}: ${chalk.yellow(line)}\n`)
+      process.stdout.write(`${chalk.cyan("docker")}: ${chalk.yellow(fmt_line(line))}\n`)
     })
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.64.0",
+  "version": "0.67.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {