diff --git a/Dockerfile b/Dockerfile index 5a65b9b18..a574e61fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ ca-certificates \ gnupg2 \ libfontconfig \ - && curl -sL https://deb.nodesource.com/setup_10.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ && apt-get install -y --no-install-recommends \ nodejs \ && apt-get purge -y --auto-remove \ diff --git a/db/docker.js b/db/docker.js index e3f105971..0a221a0be 100644 --- a/db/docker.js +++ b/db/docker.js @@ -54,7 +54,7 @@ module.exports = class Docker { this.dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort']; } - await this.waitForHealthy(); + if (runChown) await this.wait(); } catch (err) { if (this.isRandom) await this.rm(); diff --git a/gulpfile.js b/gulpfile.js index 6cf75e3fc..b946b48de 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -48,7 +48,7 @@ function backWatch(done) { // XXX: Workaround to avoid nodemon bug // https://github.com/remy/nodemon/issues/1346 - let commands = ['node --inspect ./node_modules/gulp/bin/gulp.js']; + let commands = ['node --tls-min-v1.0 --inspect ./node_modules/gulp/bin/gulp.js']; if (!isWindows) commands.unshift('sleep 1'); nodemon({ @@ -136,7 +136,7 @@ function backTest(done) { const nodemon = require('gulp-nodemon'); nodemon({ - exec: ['node ./node_modules/gulp/bin/gulp.js'], + exec: ['node --tls-min-v1.0 ./node_modules/gulp/bin/gulp.js'], args: ['backTestOnce'], watch: backSources, done: done