@rpcbase/server 0.244.0 → 0.246.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/run_docker.js +14 -2
- package/package.json +1 -1
- package/rts/index.js +1 -1
package/cli/run_docker.js
CHANGED
|
@@ -3,7 +3,9 @@ const {execSync} = require("child_process")
|
|
|
3
3
|
const path = require("path")
|
|
4
4
|
const fs = require("fs")
|
|
5
5
|
|
|
6
|
+
// TODO: this should be NODE_ENV, remove INFRASTRUCTURE_IS_PRODUCTION
|
|
6
7
|
const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
|
|
8
|
+
const is_ci = process.env.CI === "true"
|
|
7
9
|
|
|
8
10
|
const run_docker = async(infrastructure_dir, proj_prefix, args) => {
|
|
9
11
|
// env
|
|
@@ -26,8 +28,18 @@ const run_docker = async(infrastructure_dir, proj_prefix, args) => {
|
|
|
26
28
|
compose_files.push("-f", "dev.yml")
|
|
27
29
|
}
|
|
28
30
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
if (is_ci) {
|
|
32
|
+
console.log("CI==true, will skip docker build")
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const opts = [
|
|
36
|
+
is_ci ? "--no-build" : "--build",
|
|
37
|
+
/*"--quiet-pull",*/
|
|
38
|
+
"--remove-orphans",
|
|
39
|
+
"--force-recreate",
|
|
40
|
+
!is_production && "--abort-on-container-exit",
|
|
41
|
+
].filter(Boolean)
|
|
42
|
+
|
|
31
43
|
|
|
32
44
|
const cmd = "docker compose"
|
|
33
45
|
const cmd_args = ["--env-file", base_env_path, "--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
|
package/package.json
CHANGED
package/rts/index.js
CHANGED
|
@@ -165,7 +165,7 @@ const mongoose_txn_plugin = (schema, options) => {
|
|
|
165
165
|
const txn_id = _get(ctx, ["req", "headers", "rts-txn-id"])
|
|
166
166
|
|
|
167
167
|
if (!txn_id) {
|
|
168
|
-
|
|
168
|
+
log(colors.yellow("Warning!"), "mongoose save request is missing txn_id this will cause issues with rts-client")
|
|
169
169
|
} else {
|
|
170
170
|
this.set("__txn_id", txn_id)
|
|
171
171
|
}
|